@blaze-cms/react-page-builder 0.124.0-alpha.18 → 0.124.0-alpha.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.124.0-alpha.18",
+  "version": "0.124.0-alpha.19",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -84,5 +84,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "980811c31a73655a767e58ba8d465ce5604e3055"
+  "gitHead": "251b709daea87edb3b0c05a861808342ef9dc13f"
 }

package/src/components/Card/CardContainer.js

@@ -31,7 +31,6 @@ const CardContainer = ({
   enableAutoScroll,
   enableOverlay,
   autoScrollTimer,
-  arrowSize,
   overlayModifier,
   titleOverlayModifier,
   ...cardProps
@@ -88,7 +87,6 @@ const CardContainer = ({
             displayThumbnail={displayThumbnail}
             displayTitle={displayTitle}
             priority={priority}
-            arrowSize={arrowSize}
             enableOverlay={enableOverlay}
             overlayModifier={overlayModifier}
             titleOverlayModifier={titleOverlayModifier}
@@ -147,7 +145,6 @@ CardContainer.defaultProps = {
   autoScrollTimer: 0,
   overlayModifier: '',
   titleOverlayModifier: '',
-  arrowSize: ''
 };
 
 export default withTitle(CardContainer);

package/src/components/SearchContent/SearchContent.js

@@ -0,0 +1,158 @@
+import React, { useState } from 'react';
+import PropTypes from 'prop-types';
+import { useRouter } from 'next/router';
+import { useDebounceSearch } from '@blaze-cms/plugin-search-ui';
+import BlazeLink from '../BlazeLink';
+
+const SearchContent = ({
+  entities,
+  searchInputAlignment,
+  searchInputWrapperMobile,
+  searchInputWrapperDesktop,
+  collapsible,
+  isMobile,
+  placeholder
+}) => {
+  const [collapsed, setCollapsed] = useState(collapsible);
+  const router = useRouter();
+
+  const {
+    loading,
+    results,
+    searchTerm,
+    setSearchTerm,
+    setPreviousSearchTerm,
+    debouncedSearchTerm,
+    previousSearchTerm
+  } = useDebounceSearch({
+    entities,
+    initialSearchTerm: '',
+    resultKeys: 'id, name, image { url }, url'
+  });
+
+  console.log({
+    searchTerm,
+    loading,
+    results,
+    setSearchTerm,
+    setPreviousSearchTerm,
+    debouncedSearchTerm,
+    previousSearchTerm
+  });
+
+  const handleClick = (e, url) => {
+    e.preventDefault();
+    router.push(url);
+  };
+
+  const handleKeyPress = e => {
+    if (e.key === 'Enter' && e.target.value !== '') {
+      router.push(`/search?search_term=${e.target.value}`);
+    }
+  };
+
+  const SearchResults = () => {
+    return results.map(result => {
+      if (!result.url) return null;
+      const { id, name, image, url } = result;
+      return (
+        <BlazeLink href={url} onClick={e => handleClick(e, url)} key={id}>
+          <div className="search-content--results__wrapper">
+            {image.url ? (
+              <img src={image.url} alt={name} className="search-content--results__image" />
+            ) : null}
+            <span className="search-content--results__title">{name}</span>
+          </div>
+        </BlazeLink>
+      );
+    });
+  };
+
+  return collapsed ? (
+    <div className={isMobile ? searchInputWrapperMobile : searchInputWrapperDesktop}>
+      <div className="search-content--collapse__wrapper">
+        <label className="search-content--collapse__label">
+          <span className="search-content--collapse__icon_wrapper">
+            <svg className="search-content--collapse__icon" viewBox="0 0 20 20">
+              <path
+                fillRule="evenodd"
+                d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
+                clipRule="evenodd"
+              />
+            </svg>
+          </span>
+          <input
+            onFocus={() => setCollapsed(false)}
+            onChange={e => setSearchTerm(e.target.value)}
+            type="text"
+            name="search"
+            className="search-content--collapse__input"
+          />
+        </label>
+      </div>
+    </div>
+  ) : (
+    <>
+      <div className={`${isMobile ? searchInputWrapperMobile : searchInputWrapperDesktop}`}>
+        <div className="search-content--expanded__wrapper">
+          <label className="search-content--expanded__label">
+            <span className="search-content--expanded__icon_wrapper">
+              <svg className="search-content--expanded__icon" viewBox="0 0 20 20">
+                <path
+                  fillRule="evenodd"
+                  d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
+                  clipRule="evenodd"
+                />
+              </svg>
+            </span>
+            <input
+              type="text"
+              name="search"
+              onChange={e => setSearchTerm(e.target.value)}
+              onKeyPress={handleKeyPress}
+              className="search-content--expanded__input"
+              placeholder={placeholder}
+              onBlur={() => {
+                if (!collapsible) return;
+                if (!searchTerm || searchTerm === '') setCollapsed(true);
+              }}
+            />
+          </label>
+        </div>
+        {results && (
+          <div className="search-content--results__wrapper">
+            <div className="search-content--results__wrapper--message">
+              <div className="text-sm pt-2">{`Search results for: ${searchTerm}`}</div>
+              <div className="search-content--results__message">
+                <div className="search-content--results__content">
+                  <SearchResults />
+                </div>
+              </div>
+            </div>
+          </div>
+        )}
+      </div>
+    </>
+  );
+};
+
+SearchContent.propTypes = {
+  searchInputAlignment: PropTypes.string,
+  searchInputWrapperMobile: PropTypes.string,
+  searchInputWrapperDesktop: PropTypes.string,
+  placeholder: PropTypes.string,
+  isMobile: PropTypes.bool,
+  collapsible: PropTypes.bool,
+  entities: PropTypes.array.isRequired
+};
+
+SearchContent.defaultProps = {
+  searchInputAlignment: '',
+  searchInputWrapperMobile: '',
+  searchInputWrapperDesktop: '',
+  placeholder: '',
+  isMobile: false,
+  collapsible: false
+};
+
+export default SearchContent;

package/src/components/SearchContent/index.js

@@ -1,219 +1,3 @@
-import React, { useState } from 'react';
-import PropTypes from 'prop-types';
-import { gql, useApolloClient } from '@apollo/client';
+import SearchContent from "./SearchContent";
 
-import { useRouter } from 'next/router';
-import { getPublishedContent } from '../../application/query';
-import BlazeLink from '../BlazeLink';
-
-const logError = error => error;
-
-const SearchContent = ({
-  entities,
-  searchInputAlignment,
-  searchInputWrapperMobile,
-  searchInputWrapperDesktop,
-  collapsible,
-  isMobile,
-  placeholder
-}) => {
-  const [collapsed, setCollapsed] = useState(collapsible);
-  const [searchTerm, setSearchTerm] = useState(null);
-  const [data, setData] = useState([]);
-
-  const router = useRouter();
-  const client = useApolloClient();
-
-  const capitalize = s => {
-    if (typeof s !== 'string') return '';
-    return s.charAt(0).toUpperCase() + s.slice(1);
-  };
-
-  React.useEffect(() => {
-    if (data && data.length !== 0) return;
-
-    const promises = entities.map(entity => {
-      const [a, b] = entity.split('_');
-
-      const entityName = capitalize(a) + capitalize(b);
-
-      const rawQueryStringified = JSON.stringify({
-        size: 0,
-        query: {
-          bool: {
-            should: [
-              {
-                match: {
-                  docType: entity
-                }
-              }
-            ],
-            minimum_should_match: 1
-          }
-        }
-      });
-
-      const query = gql`
-        ${getPublishedContent(entityName)}
-      `;
-
-      try {
-        return client.query({
-          query,
-          variables: {
-            rawQueryStringified,
-            offset: 0,
-            limit: 5
-          }
-        });
-      } catch (e) {
-        return [];
-      }
-    });
-
-    try {
-      (async () => {
-        try {
-          const fetchResults = await Promise.all(promises);
-          const searchResults = fetchResults
-            .map(result => {
-              const { data: resultData } = result;
-              return resultData.searchPublishedContent.results;
-            })
-            .flat();
-
-          setData(searchResults);
-        } catch (e) {
-          logError(e);
-        }
-      })();
-    } catch (e) {
-      logError(e);
-    }
-  });
-
-  const handleClick = (e, url) => {
-    e.preventDefault();
-    router.push(url);
-  };
-
-  const handleKeyPress = e => {
-    if (e.key === 'Enter' && e.target.value !== '') {
-      router.push(`/search?search_term=${e.target.value}`);
-    }
-  };
-
-  const renderResults = () =>
-    // eslint-disable-next-line no-undef
-    data?.map(dataItem => {
-      const { name, image, url } = dataItem;
-
-      if (searchTerm && searchTerm !== '') {
-        if (name.includes(searchTerm)) {
-          return (
-            <BlazeLink href={url} onClick={e => handleClick(e, url)}>
-              <div className="search-content--results__wrapper">
-                {image.url ? (
-                  <img src={image.url} alt={name} className="search-content--results__image" />
-                ) : null}
-                <span className="search-content--results__title">{name}</span>
-              </div>
-            </BlazeLink>
-          );
-        }
-
-        return null;
-      }
-    });
-
-  const searchResultsMessage = searchTerm ? `Search results for: ${searchTerm}` : '';
-
-  return collapsed ? (
-    <div className={isMobile ? searchInputWrapperMobile : searchInputWrapperDesktop}>
-      <div className="search-content--collapse__wrapper">
-        <label className="search-content--collapse__label">
-          <span className="search-content--collapse__icon_wrapper">
-            <svg className="search-content--collapse__icon" viewBox="0 0 20 20">
-              <path
-                fillRule="evenodd"
-                d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
-                clipRule="evenodd"
-              />
-            </svg>
-          </span>
-          <input
-            onFocus={() => setCollapsed(false)}
-            onChange={e => setSearchTerm(e.target.value)}
-            type="text"
-            name="search"
-            value=""
-            className="search-content--collapse__input"
-          />
-        </label>
-      </div>
-    </div>
-  ) : (
-    <>
-      <div className={`${isMobile ? searchInputWrapperMobile : searchInputWrapperDesktop}`}>
-        <div className="search-content--expanded__wrapper">
-          <label className="search-content--expanded__label">
-            <span className="search-content--expanded__icon_wrapper">
-              <svg className="search-content--expanded__icon" viewBox="0 0 20 20">
-                <path
-                  fillRule="evenodd"
-                  d="M8 4a4 4 0 100 8 4 4 0 000-8zM2 8a6 6 0 1110.89 3.476l4.817 4.817a1 1 0 01-1.414 1.414l-4.816-4.816A6 6 0 012 8z"
-                  clipRule="evenodd"
-                />
-              </svg>
-            </span>
-            <input
-              type="text"
-              name="search"
-              onChange={e => setSearchTerm(e.target.value)}
-              onKeyPress={handleKeyPress}
-              className="search-content--expanded__input"
-              placeholder={placeholder}
-              onBlur={() => {
-                if (!collapsible) return;
-                if (!searchTerm || searchTerm === '') setCollapsed(true);
-              }}
-            />
-          </label>
-        </div>
-        {data &&
-          searchResultsMessage !== '' && (
-            <div className="search-content--results__wrapper">
-              <div className="search-content--results__wrapper--message">
-                <div className="text-sm pt-2">{searchResultsMessage}</div>
-
-                <div className="search-content--results__message">
-                  <div className="search-content--results__content">{renderResults()}</div>
-                </div>
-              </div>
-            </div>
-          )}
-      </div>
-    </>
-  );
-};
-
-SearchContent.propTypes = {
-  searchInputAlignment: PropTypes.string,
-  searchInputWrapperMobile: PropTypes.string,
-  searchInputWrapperDesktop: PropTypes.string,
-  placeholder: PropTypes.string,
-  isMobile: PropTypes.bool,
-  collapsible: PropTypes.bool,
-  entities: PropTypes.array.isRequired
-};
-
-SearchContent.defaultProps = {
-  searchInputAlignment: '',
-  searchInputWrapperMobile: '',
-  searchInputWrapperDesktop: '',
-  placeholder: '',
-  isMobile: false,
-  collapsible: false
-};
-
-export default SearchContent;
+export default SearchContent;

package/src/components/index.js

@@ -18,7 +18,7 @@ export default {
   video: dynamic(() => import(/* webpackChunkName: "blazePbVideo" */ './Video')),
   wrapper: dynamic(() => import(/* webpackChunkName: "blazePbWrapper" */ './Wrapper')),
   searchcontent: dynamic(() =>
-    import(/* webpackChunkName: "blazePbSearchFilter" */ './SearchContent')
+    import(/* webpackChunkName: "blazePbSearchFilter" */ './SearchContent/SearchContent')
   ),
   searchfilter: dynamic(() =>
     import(/* webpackChunkName: "blazePbSearchFilter" */ './SearchFilter')