@redneckz/wildless-cms-uni-blocks 0.14.945 → 0.14.947

package/src/components/Footer/renderLogoSearchBar.tsx

@@ -5,14 +5,19 @@ import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
 import { LEFT_COLUMN_STYLE } from './leftColumnStyle';
 
 export const renderLogoSearchBar = (common?: CommonData, navigationItems?: TopMenuItemProps[]) => {
-  const { logo } = common ?? {};
+  const { logo, search } = common ?? {};
   // eslint-disable-next-line @typescript-eslint/no-unused-vars
   const { dataHeader, dataFooter, ...logoProps } = logo ?? {};
 
   return (
     <div className="flex items-stretch gap-3xl">
       <Logo className={LEFT_COLUMN_STYLE} logo={logoProps} data={dataFooter} showTitle={false} />
-      <SearchBar className="grow" navigationItems={navigationItems} {...common} />
+      <SearchBar
+        className="grow"
+        navigationItems={navigationItems}
+        placeholder={search?.placeholder}
+        {...common}
+      />
     </div>
   );
 };

package/src/ui-kit/SearchBar/SearchBar.tsx

@@ -3,13 +3,14 @@ import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type SearchHeaderProps } from '../../data/CommonData';
 import { type TopMenuItemProps } from '../../data/NavigationData';
 import { type ComponentType } from '../../model/ComponentType';
+import { type PlaceholderProps } from '../../model/PlaceholderProps';
 import { style } from '../../utils/style';
 import { CloseButton } from '../DialogManager/CloseButton';
 import { useDialog } from '../DialogManager/useDialog';
 import { SearchDialog } from '../SearchDialog/SearchDialog';
 import { SearchInput } from '../SearchDialog/SearchInput';
 
-interface SearchBarProps extends ComponentType {
+interface SearchBarProps extends ComponentType, PlaceholderProps {
   search?: SearchHeaderProps;
   navigationItems?: TopMenuItemProps[];
 }
@@ -38,6 +39,7 @@ export const SearchBar = JSX<SearchBarProps>(({ className, search, ...rest }) =>
         value={value}
         placeholder={search?.placeholder}
         onChange={handleInitialInputChange}
+        {...rest}
       />
       <CloseButton className="absolute top-0 right-0 sm:hidden" onClose={resetQueryOnDialogClose} />
     </div>

package/src/ui-kit/SearchDialog/SearchDialog.tsx

@@ -1,5 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import type { SearchHeaderProps } from '../../data/CommonData';
 import { type TopMenuItemProps } from '../../data/NavigationData';
 import { env } from '../../Env';
 import { type LinkProps } from '../../model/LinkProps';
@@ -15,38 +16,48 @@ import { SearchInput } from './SearchInput';
 export interface SearchDialogProps extends OnCloseProps {
   initialQuery?: string;
   navigationItems?: TopMenuItemProps[];
+  search?: SearchHeaderProps;
 }
 
 const IS_SINGLE_SEARCH_INDEX = Boolean(env.SINGLE_SEARCH_INDEX);
 
-export const SearchDialog = JSX<SearchDialogProps>(({ initialQuery, navigationItems, onClose }) => {
-  const basePath = getBasePath(env.SITE_URL);
-
-  const basePathList = useMemo(
-    () => (IS_SINGLE_SEARCH_INDEX ? [basePath] : navigationItems?.map((_) => _.href || '/')),
-    [navigationItems],
-  );
-
-  const [searchResult, searchInputProps] = useSearch({
-    basePathList,
-    initialQuery,
-  });
-
-  const searchItems = useMemo(
-    () => combineTopItemsAndSearchResult(navigationItems)(searchResult),
-    [navigationItems, searchResult],
-  );
-
-  return (
-    <Dialog
-      maxWidth="none"
-      head={<SearchInput className="mt-s" autoFocus={true} {...searchInputProps} />}
-      onClose={onClose}
-    >
-      <Sitemap navigationItems={searchItems} isSearchPanel={true} />
-    </Dialog>
-  );
-});
+export const SearchDialog = JSX<SearchDialogProps>(
+  ({ initialQuery, navigationItems, onClose, search }) => {
+    const basePath = getBasePath(env.SITE_URL);
+
+    const basePathList = useMemo(
+      () => (IS_SINGLE_SEARCH_INDEX ? [basePath] : navigationItems?.map((_) => _.href || '/')),
+      [navigationItems],
+    );
+
+    const [searchResult, searchInputProps] = useSearch({
+      basePathList,
+      initialQuery,
+    });
+
+    const searchItems = useMemo(
+      () => combineTopItemsAndSearchResult(navigationItems)(searchResult),
+      [navigationItems, searchResult],
+    );
+
+    return (
+      <Dialog
+        maxWidth="none"
+        head={
+          <SearchInput
+            className="mt-s"
+            autoFocus={true}
+            placeholder={search?.placeholder}
+            {...searchInputProps}
+          />
+        }
+        onClose={onClose}
+      >
+        <Sitemap navigationItems={searchItems} isSearchPanel={true} />
+      </Dialog>
+    );
+  },
+);
 
 const combineTopItemsAndSearchResult =
   (topItems: TopMenuItemProps[] | undefined) =>

package/tailwind.config.cjs

@@ -67,7 +67,7 @@ module.exports = {
       },
       flexShrink: { '1/2': '0.5' },
       fontFamily: {
-        sans: ['Ubuntu', ...defaultTheme.fontFamily.sans],
+        sans: ['Ubuntu', 'NotoSansSC', ...defaultTheme.fontFamily.sans],
         mohave: ['Mohave', ...defaultTheme.fontFamily.sans],
       },
       fontSize: {