ublo-lib 1.11.3 → 1.11.4

package/es/common/components/search-bar/hooks/use-constant.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-const useConstant = fn => {
+export default function useConstant(fn) {
   const ref = React.useRef();
   if (!ref.current) {
     ref.current = {
@@ -7,5 +7,4 @@ const useConstant = fn => {
     };
   }
   return ref.current.v;
-};
-export default useConstant;
+}

package/es/common/components/search-bar/hooks/use-debounced-search.js

@@ -1,10 +1,11 @@
-import { useState } from "react";
+import * as React from "react";
 import debouncePromise from "awesome-debounce-promise";
-import useConstant from "./use-constant";
 import { useAsync } from "react-async-hook";
-export const useDebouncedSearch = searchFunction => {
-  const [text, setText] = useState("");
-  const debouncedSearchFunction = useConstant(() => debouncePromise(searchFunction, 200));
+import useConstant from "./use-constant";
+const DEBOUNCE_AMOUNT = 600;
+export default function useDebouncedSearch(searchFunction) {
+  const [text, setText] = React.useState("");
+  const debouncedSearchFunction = useConstant(() => debouncePromise(searchFunction, DEBOUNCE_AMOUNT));
   const search = useAsync(async () => text.length === 0 ? undefined : debouncedSearchFunction(text), [debouncedSearchFunction, text], {
     setLoading: state => ({
       ...state,
@@ -16,4 +17,4 @@ export const useDebouncedSearch = searchFunction => {
     setText,
     search
   };
-};
+}

package/es/common/components/search-bar/hooks/use-search.js

@@ -1,3 +1,13 @@
-import { useDebouncedSearch } from "./use-debounced-search";
+import useDebouncedSearch from "./use-debounced-search";
 import { fetchResults } from "../utils/fetcher";
-export const useSearch = (ubloApi, site, lang, seo, exclude) => useDebouncedSearch(query => fetchResults(ubloApi, site, lang, query, seo, exclude));
+export default function useSearch({
+  ubloApi,
+  site,
+  lang,
+  seo,
+  exclude
+}) {
+  return useDebouncedSearch(async query => {
+    return fetchResults(ubloApi, site, lang, query, seo, exclude);
+  });
+}

package/es/common/components/search-bar/search-bar.js

@@ -4,9 +4,9 @@ import Router from "next/router";
 import getConfig from "next/config";
 import Link from "ublo/link";
 import { useUbloContext } from "ublo/with-ublo";
-import { SearchIcon, LoadIcon } from "./icons";
+import * as DSIcons from "dt-design-system/es/icons";
 import * as Plausible from "../plausible";
-import { useSearch } from "./hooks/use-search";
+import useSearch from "./hooks/use-search";
 import * as KeyboardKeys from "./utils/keyboard-keys";
 import { message } from "./messages";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -14,6 +14,10 @@ import { jsxs as _jsxs } from "react/jsx-runtime";
 const {
   publicRuntimeConfig
 } = getConfig();
+const {
+  ubloApi,
+  site
+} = publicRuntimeConfig;
 const SearchBar = ({
   lang,
   resultFormatter,
@@ -33,21 +37,25 @@ const SearchBar = ({
   const {
     lang: ubloLang = lang
   } = useUbloContext();
-  const {
-    ubloApi,
-    site
-  } = publicRuntimeConfig;
   const {
     text,
     setText,
     search
-  } = useSearch(ubloApi, site, ubloLang, seo, exclude);
+  } = useSearch({
+    ubloApi,
+    site,
+    lang: ubloLang,
+    seo,
+    exclude
+  });
   const DefaultIcons = {
-    SearchIcon,
-    LoadIcon
+    SearchIcon: DSIcons.Search,
+    LoadIcon: DSIcons.Loader2
+  };
+  const Icons = Object.assign({}, DefaultIcons, OverrideIcons);
+  const close = () => {
+    setText("");
   };
-  const Icons = Object.assign(DefaultIcons, OverrideIcons);
-  const close = () => setText("");
   const onChange = e => {
     const userInput = e.currentTarget.value;
     setText(userInput);
@@ -89,8 +97,12 @@ const SearchBar = ({
       newSelected = up ? selectedResult.previousElementSibling || lastResult : selectedResult.nextElementSibling || firstResult;
     }
     allResults.forEach(result => result.classList.remove("search-bar__result--selected"));
-    newSelected && newSelected.classList.add("search-bar__result--selected");
-    container && newSelected && (container.scrollTop = newSelected.offsetTop - newSelected.clientHeight);
+    if (newSelected) {
+      newSelected.classList.add("search-bar__result--selected");
+    }
+    if (container && newSelected) {
+      container.scrollTop = newSelected.offsetTop - newSelected.clientHeight;
+    }
   };
   const focusInput = () => {
     input.current.focus();

package/es/esf/components/instructors-book-v2/instructor.js

@@ -98,6 +98,7 @@ export default function Instructor({
       isOpened: popupOpened,
       close: closePopup,
       onClose: closePopup,
+      showAsModal: false,
       children: _jsx("div", {
         className: css.dialogContent,
         children: _jsx(Sheet, {

package/es/esf/components/instructors-book-v2/sheet.module.css

@@ -24,9 +24,6 @@
   gap: 26px;
 }
 
-.link {
-}
-
 .header {
   display: flex;
   align-items: center;
@@ -40,7 +37,6 @@
   display: flex;
   align-items: center;
   justify-content: center;
-  border-bottom: 1px solid var(--ds-grey-100, #f5f5f5);
   border-radius: var(--ds-radius-200, 10px);
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ublo-lib",
-  "version": "1.11.3",
+  "version": "1.11.4",
   "peerDependencies": {
     "dt-design-system": "^2.1.0",
     "leaflet": "^1.9.1",

package/es/common/components/search-bar/icons.js

@@ -1,25 +0,0 @@
-import * as React from "react";
-import { jsx as _jsx } from "react/jsx-runtime";
-const Icon = ({
-  width = 24,
-  height = 24,
-  ...props
-}) => _jsx("svg", {
-  viewBox: `0 0 ${width} ${height}`,
-  width: width,
-  height: height,
-  ...props,
-  children: props.children
-});
-export const SearchIcon = props => _jsx(Icon, {
-  ...props,
-  children: _jsx("path", {
-    d: "M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"
-  })
-});
-export const LoadIcon = props => _jsx(Icon, {
-  ...props,
-  children: _jsx("path", {
-    d: "M19 8l-4 4h3c0 3.31-2.69 6-6 6-1.01 0-1.97-.25-2.8-.7l-1.46 1.46C8.97 19.54 10.43 20 12 20c4.42 0 8-3.58 8-8h3l-4-4zM6 12c0-3.31 2.69-6 6-6 1.01 0 1.97.25 2.8.7l1.46-1.46C15.03 4.46 13.57 4 12 4c-4.42 0-8 3.58-8 8H1l4 4 4-4H6z"
-  })
-});