@redneckz/wildless-cms-uni-blocks 0.8.26 → 0.8.28

package/mobile/src/services/sitemap/search/jaroWinklerDistance.ts

@@ -0,0 +1,98 @@
+const JARO_WINKLER_P = 0.1;
+const JARO_WINKLER_MAX_L = 4;
+
+export const jaroWinklerDistance =
+  (s1: string | undefined) =>
+  (s2: string | undefined): number => {
+    if (s1 === s2) {
+      return 1;
+    }
+
+    if (!s1 || !s2) {
+      return 0;
+    }
+
+    const { m, s1Matches, s2Matches } = computeM(s1, s2);
+
+    if (m === 0) {
+      return 0;
+    }
+
+    const t = computeT(s1, s2, { s1Matches, s2Matches });
+
+    const jaroWeight = (m / s1.length + m / s2.length + (m - t / 2) / m) / 3;
+    const winklerWeight = jaroWeight > 0.7 ? computePrefixL(s1, s2) * JARO_WINKLER_P : 0;
+
+    return jaroWeight + winklerWeight * (1 - jaroWeight);
+  };
+
+function computeM(
+  s1: string,
+  s2: string,
+): {
+  m: number;
+  s1Matches: boolean[];
+  s2Matches: boolean[];
+} {
+  const range = Math.max(0, Math.floor(Math.max(s1.length, s2.length) / 2) - 1);
+
+  const s1Matches = new Array<boolean>(s1.length);
+  const s2Matches = new Array<boolean>(s2.length);
+
+  let m = 0;
+
+  for (let i = 0; i < s1.length; i++) {
+    const low = Math.max(0, i - range);
+    const high = Math.min(i + range, s2.length - 1);
+
+    for (let j = low; j <= high; j++) {
+      if (s1Matches[i] || s2Matches[j] || s1[i] !== s2[j]) {
+        continue;
+      }
+
+      m++;
+      s1Matches[i] = true;
+      s2Matches[j] = true;
+    }
+  }
+
+  return { m, s1Matches, s2Matches };
+}
+
+function computeT(
+  s1: string,
+  s2: string,
+  { s1Matches, s2Matches }: { s1Matches: boolean[]; s2Matches: boolean[] },
+): number {
+  let t = 0;
+
+  for (let i = 0, k = 0; i < s1.length; i++) {
+    if (!s1Matches[i]) {
+      continue;
+    }
+
+    let j = k;
+    for (; j < s2.length; j++) {
+      if (s2Matches[j]) {
+        k = j + 1;
+        break;
+      }
+    }
+
+    if (s1[i] !== s2[j]) {
+      t++;
+    }
+  }
+
+  return t;
+}
+
+function computePrefixL(s1: string, s2: string): number {
+  let prefixL = 0;
+
+  while (s1[prefixL] === s2[prefixL] && prefixL < JARO_WINKLER_MAX_L) {
+    prefixL++;
+  }
+
+  return prefixL;
+}

package/mobile/src/services/sitemap/search/joinMaps.ts

@@ -0,0 +1,9 @@
+export const joinMaps =
+  <K, A, B>(aggregate: (a: A, b: B) => A, emptyVal: A) =>
+  (acc: Map<K, A>, map: Map<K, B>): Map<K, A> => {
+    for (const [key, b] of map) {
+      acc.set(key, aggregate(acc.get(key) || emptyVal, b));
+    }
+
+    return acc;
+  };

package/mobile/src/services/sitemap/search/search.ts

@@ -0,0 +1,73 @@
+import { compareBy, desc } from '../../../utils/Comparator';
+import { zip } from '../../../utils/zip';
+import { jaroWinklerDistance } from './jaroWinklerDistance';
+import { joinMaps } from './joinMaps';
+import { textRank } from './textRank';
+import { tokenize } from './tokenize';
+
+export interface CorpusItem {
+  uri?: string;
+  title?: string;
+}
+
+type Stem = string;
+type CorpusItemIndex = number;
+
+export interface SearchIndex {
+  corpus?: CorpusItem[];
+  dictionary?: Record<Stem, CorpusItemIndex[]>;
+}
+
+type Rank = number;
+type PageRanking = Map<CorpusItemIndex, Rank>;
+
+const JW_THRESHOLD = 0.8;
+const RANK_EPS = 0.001;
+
+export const search =
+  (query: string | undefined) =>
+  (searchIndex: SearchIndex | undefined): CorpusItem[] => {
+    const { corpus, dictionary } = searchIndex || {};
+    if (!query || !corpus?.length || !dictionary || !Object.keys(dictionary).length) {
+      return [];
+    }
+
+    const queryTokens = tokenize(query);
+    if (!queryTokens.length) {
+      return [];
+    }
+
+    const dictEntries = Object.entries(dictionary);
+    const pagesRanking: PageRanking = queryTokens
+      .map(computePagesRankingPerToken(dictEntries))
+      .reduce(
+        joinMaps((a, b) => a + b, 0),
+        new Map(),
+      );
+
+    const relevantPages: CorpusItem[] = [...pagesRanking.entries()]
+      .filter(([, pageRank]) => pageRank >= (JW_THRESHOLD - RANK_EPS) * queryTokens.length) // Multiplication of query tokens
+      .map(([pageIndex]) => corpus[pageIndex]);
+
+    return sortResultsByRank(queryTokens)(relevantPages);
+  };
+
+const computePagesRankingPerToken =
+  (dictEntries: Array<[Stem, CorpusItemIndex[]]>) => (qToken: string) =>
+    dictEntries
+      .map(
+        ([stem, pageIndices]) =>
+          [jaroWinklerDistance(qToken)(stem), pageIndices] as [Rank, CorpusItemIndex[]],
+      )
+      .filter(([stemRank]) => stemRank >= JW_THRESHOLD)
+      .map(([stemRank, pageIndices]) => fillMapWith(pageIndices, stemRank))
+      .reduce(joinMaps(Math.max, 0), new Map<CorpusItemIndex, Rank>());
+
+const sortResultsByRank =
+  (queryTokens: string[]) =>
+  (results: CorpusItem[]): CorpusItem[] =>
+    zip(results, results.map(({ title }) => title).map(textRank(queryTokens)))
+      .sort(desc(compareBy(([, pageTitleRank]) => pageTitleRank)))
+      .map(([corpusItem]) => corpusItem);
+
+const fillMapWith = <K, V>(keys: K[], value: V): Map<K, V> => new Map(keys.map((_) => [_, value]));

package/mobile/src/services/sitemap/search/textRank.ts

@@ -0,0 +1,14 @@
+import { max } from '../../../utils/maxBy';
+import { sum } from '../../../utils/sum';
+import { jaroWinklerDistance } from './jaroWinklerDistance';
+import { tokenize } from './tokenize';
+
+export const textRank =
+  (queryTokens: string[]) =>
+  (text: string | undefined): number => {
+    const textTokens = tokenize(text || '');
+
+    return textTokens.length
+      ? sum(queryTokens.map((qToken) => max(textTokens.map(jaroWinklerDistance(qToken)))))
+      : 0;
+  };

package/mobile/src/services/sitemap/search/tokenize.ts

@@ -0,0 +1,7 @@
+const MIN_TERM_LEN = 3;
+
+export const tokenize = (text: string) =>
+  text
+    .toLowerCase()
+    .split(/[^0-9a-zа-я-]+/)
+    .filter((token) => token.length >= MIN_TERM_LEN && !/[0-9a-z]/.test(token));

package/mobile/src/services/sitemap/useSearch.ts

@@ -0,0 +1,56 @@
+import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useAsyncData } from '@redneckz/uni-jsx/lib/hooks/useAsyncData';
+import { fetchJSON } from '../../utils/fetchJSON';
+import { joinPath } from '../../utils/url';
+import { CorpusItem, search, SearchIndex } from './search/search';
+
+const SEARCH_INDEX_FILENAME = 'search.index.json';
+
+export type SearchResult = Array<CorpusItem[]>; // List of pages (CorpusItem) per base path from "basePathList"
+
+export interface SearchInputProps {
+  value: string;
+  onChange: (query: string) => void;
+  onFocus: () => void;
+}
+
+export const useSearch = (
+  basePathList: string[] = ['/'],
+): [SearchResult | null, SearchInputProps] => {
+  const [query, setQuery] = useState('');
+
+  const [wasQueryFocused, setWasQueryFocused] = useState(false);
+  const handleFocus = useCallback(() => {
+    setWasQueryFocused(true);
+  }, []);
+
+  const key = useMemo(
+    () => basePathList.map((_) => (wasQueryFocused ? _ : null)), // Load search index on input focus
+    [wasQueryFocused, ...basePathList],
+  );
+
+  const { data } = useAsyncData(key, fetchSearchIndex);
+
+  const [result, setResult] = useState<SearchResult | null>(null);
+
+  useEffect(() => {
+    const timerId = setTimeout(() => {
+      if (data) {
+        setResult(data.map(search(query)));
+      }
+    }, 300);
+
+    return () => {
+      clearTimeout(timerId);
+    };
+  }, [data, query]);
+
+  return [result, { value: query, onChange: setQuery, onFocus: handleFocus }];
+};
+
+const fetchSearchIndex = async (...basePathList: (string | null)[]): Promise<SearchIndex[]> =>
+  (
+    await Promise.allSettled<SearchIndex | null>(
+      basePathList.map((basePath) => fetchJSON(joinPath(basePath, '/', SEARCH_INDEX_FILENAME))),
+    )
+  ).map((_) => (_.status === 'fulfilled' ? _.value : {}) as SearchIndex);

package/mobile/src/ui-kit/BlockWrapper.tsx

@@ -1,14 +1,15 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { defaultEventBus } from '../EventBus/defaultEventBus';
-import type { BlockVersion } from '../model/BlockVersion';
-import type { UniBlockProps } from '../model/JSXBlock';
 import { useBlockIntersectionObserver } from '../services/BlockRouter/useBlockIntersectionObserver';
 import { style } from '../utils/style';
+import type { BlockVersion } from '../model/BlockVersion';
+import type { UniBlockProps } from '../model/JSXBlock';
 
 interface BlockWrapperProps extends UniBlockProps {
   tag?: keyof HTMLElementTagNameMap;
   role?: string;
+  extraProps?: Record<string, any>;
 }
 
 export const blockStyles: Record<BlockVersion, string> = {
@@ -27,6 +28,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
     tag = 'section',
     role,
     isTheme = true,
+    extraProps = {},
     children,
   }) => {
     const Tag: any = tag;
@@ -47,7 +49,7 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
     return (
       <Tag
         className={style(
-          isTheme ? 'group' : '',
+          groupStyle(Boolean(version && isTheme)),
           blockStyles[version],
           isHidden ? 'hidden' : '',
           className,
@@ -55,9 +57,12 @@ export const BlockWrapper = JSX<BlockWrapperProps>(
         {...(version && isTheme ? { 'data-ver': version } : {})}
         {...(block?.anchor ? { id: block.anchor, ref } : {})}
         role={role}
+        {...extraProps}
       >
         {children}
       </Tag>
     );
   },
 );
+
+const groupStyle = (isGroup: boolean): string => (isGroup ? 'group' : '');

package/mobile/src/ui-kit/Button/ButtonProps.ts

@@ -18,16 +18,16 @@ export interface ButtonAdditionalProps {
  * @title Кнопка
  */
 export interface ButtonProps extends ButtonAdditionalProps, LinkProps {
-  /**
-   * @title Текст
-   * @default Кнопка
-   */
+  /** @title Текст */
   text?: string;
   /** @title Закругленные углы */
   rounded?: boolean;
   version?: ButtonVersion;
 }
 
+/**
+ * @title Кнопка
+ */
 export interface ButtonWithIconProps extends ButtonProps {
   /** @title Иконка слева */
   icon?: Picture;

package/mobile/src/ui-kit/InputRange/InputRangeProps.ts

@@ -1,4 +1,6 @@
-export interface InputRangeProps {
+import type { ListContent } from '../List/ListContent';
+
+export interface InputRangeProps extends ListContent {
   className?: string;
   items?: string[];
   min?: number;

package/mobile/src/ui-kit/List/ListProps.ts

@@ -1,3 +1,4 @@
+import type { BulletsProps } from '../../model/Bullets';
 import type { ListContent } from './ListContent';
 
 /**
@@ -9,14 +10,13 @@ export type ListItemSize = 'S' | 'M' | 'L';
 /**
  * @title Содержимое списка
  */
-export interface ListProps extends ListContent {
-  /** @hidden */
-  className?: string;
-  /** @title Отступ */
-  hasIndent?: boolean;
-  /** @hidden */
-  itemClassName?: string;
-  /** @title Буллиты */
-  isDotted?: boolean;
-  listItemSize?: ListItemSize;
-}
+export type ListProps = ListContent &
+  BulletsProps & {
+    /** @hidden */
+    className?: string;
+    /** @title Отступ */
+    hasIndent?: boolean;
+    /** @hidden */
+    itemClassName?: string;
+    listItemSize?: ListItemSize;
+  };

package/mobile/src/ui-kit/Location/Location.tsx

@@ -1,45 +1,26 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
+import { useState } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
-import type { Region } from '../../hooks/useRegions';
 import { useRegions } from '../../hooks/useRegions';
-import { useSearch } from '../../hooks/useSearch';
-import type { UniBlockProps } from '../../model/JSXBlock';
-import type { ForeignOffice } from '../../services/sitemap/SitemapProps';
 import { Text } from '../../ui-kit/Text/Text';
 import { groupBy } from '../../utils/groupBy';
 import { Img } from '../Img/Img';
 import { SearchBar } from './SearchBar';
+import type { ForeignOffice } from '../../services/sitemap/SitemapData';
+import type { Region } from '../../hooks/useRegions';
+import type {
+  LocationProps,
+  CurrentLocationProps,
+  CloseButtonProps,
+  RegionLinkProps,
+  ForeignOfficeProps,
+} from './LocationProps';
 
 const SEARCH_TERM_MIN_LENGTH = 3;
 
-interface RegionLinkProps {
-  onChangeLocation?: (region: Region) => void;
-}
-
-interface CloseButtonProps {
-  close?: () => void;
-}
-
-interface CurrentLocationProps {
-  currentLocation?: Region;
-}
-
-interface ForeignOfficeProps {
-  foreignOffices?: ForeignOffice[];
-}
-
-export type LocationProps = ForeignOfficeProps &
-  CloseButtonProps &
-  RegionLinkProps &
-  CurrentLocationProps &
-  UniBlockProps;
-
 export const Location = JSX<LocationProps>(
   ({ currentLocation, onChangeLocation, close, foreignOffices }) => {
-    const { term, setTerm } = useSearch();
-
-    const handleSearch = useCallback((_: string) => setTerm(_), []);
+    const [query, setQuery] = useState('');
 
     const regions: Region[] = cleanUpRegions(useRegions()).sort((a, b) =>
       a.name.localeCompare(b.name),
@@ -47,16 +28,18 @@ export const Location = JSX<LocationProps>(
     const regionsGroupByLetter: Map<string, Region[]> = groupBy(regions, regionFirstLetter);
 
     return (
-      <div className="absolute h-full w-full inset-0 bg-white text-l-light z-50">
-        <CloseButton close={close} />
-        <div className="container py-12">
-          <CurrentLocation currentLocation={currentLocation} />
-          <SearchBar onSearch={handleSearch} searchTerm={term} className="mb-7" />
-
-          {term && term.length >= SEARCH_TERM_MIN_LENGTH ? (
+      <div className="absolute h-full w-full inset-0 bg-white text-l-light z-50 overflow-x-hidden overflow-y-scroll">
+        <div className="relative container pt-6 pb-12">
+          <div className="sticky bg-white pt-6 top-0">
+            <CloseButton close={close} />
+            <CurrentLocation currentLocation={currentLocation} />
+            <SearchBar onSearch={setQuery} searchTerm={query} className="mb-7" />
+          </div>
+
+          {query && query.length >= SEARCH_TERM_MIN_LENGTH ? (
             <div>
               {regions
-                .filter((region) => region.name?.startsWith(term))
+                .filter((region) => region.name?.startsWith(query))
                 .map(renderRegion({ onChangeLocation, close }))}
             </div>
           ) : (
@@ -89,7 +72,7 @@ const CurrentLocation = JSX<CurrentLocationProps>(({ currentLocation }) =>
         Сейчас выбран:&nbsp;
       </Text>
       <button className="cursor-pointer" onClick={close}>
-        <Text color="text-green">{currentLocation.name}</Text>
+        <Text color="text-primary-main">{currentLocation.name}</Text>
       </button>
     </div>
   ) : null,
@@ -97,7 +80,7 @@ const CurrentLocation = JSX<CurrentLocationProps>(({ currentLocation }) =>
 
 const CloseButton = JSX<CloseButtonProps>(({ close }) => (
   <button
-    className="visible peer-placeholder-shown:invisible absolute top-6 right-6 w-6 h-6 p-1 bg-transparent cursor-pointer border-none"
+    className="visible peer-placeholder-shown:invisible absolute top-0 -right-6 w-6 h-6 p-1 bg-transparent cursor-pointer border-none"
     onClick={(e) => {
       e.preventDefault();
       close && close();

package/mobile/src/ui-kit/Location/LocationProps.ts

@@ -0,0 +1,25 @@
+import { Region } from '../../hooks/useRegions';
+import { ForeignOffice } from '../../services/sitemap/SitemapData';
+import { UniBlockProps } from '../../model/JSXBlock';
+
+export interface RegionLinkProps {
+  onChangeLocation?: (region: Region) => void;
+}
+
+export interface CloseButtonProps {
+  close?: () => void;
+}
+
+export interface CurrentLocationProps {
+  currentLocation?: Region;
+}
+
+export interface ForeignOfficeProps {
+  foreignOffices?: ForeignOffice[];
+}
+
+export type LocationProps = ForeignOfficeProps &
+  CloseButtonProps &
+  RegionLinkProps &
+  CurrentLocationProps &
+  UniBlockProps;

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

@@ -21,7 +21,7 @@ export const SearchBar = JSX<SearchBarInnerProps>(({ className, searchTerm, onSe
         className={`h-12 pl-4 w-full peer text-l text-black border border-solid rounded-md box-border
               outline-none border-gray hover:border-primary-hover active:border-primary-text focus:border-primary-text`}
         value={searchTerm}
-        onChange={(e) => onSearch(e.target.value as string)}
+        onChange={(e) => onSearch(e.target.value.toLowerCase() as string)}
         type="text"
         name="location-search-bar-input"
       />

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

@@ -1,69 +1,72 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useSearch } from '../../hooks/useSearch';
 import { Button } from '../Button/Button';
 import { Img } from '../Img/Img';
 
 export interface SearchBarInnerProps {
   isMobile?: boolean;
   className?: string;
+  value?: string;
+  onChange?: (value: string) => void;
+  onFocus?: () => void;
 }
 
-export const SearchBarInner = JSX<SearchBarInnerProps>(({ className, isMobile = false }) => {
-  const { term, setTerm } = useSearch();
+export const SearchBarInner = JSX<SearchBarInnerProps>(
+  ({ className, isMobile, value: query, onChange, onFocus }) => {
+    const LoupeIconClassName = isMobile ? 'w-5 h-5' : 'w-6 h-6';
+    const SearchBarLabelClassName = isMobile ? 'text-s' : 'text-l-light';
+    const SearchBarInputClassName = isMobile ? ' placeholder-transparent' : 'h-full';
+    const inputPlaceholder = isMobile ? 'some search' : undefined;
 
-  const LoupeIconClassName = isMobile ? 'w-5 h-5' : 'w-6 h-6';
-  const SearchBarLabelClassName = isMobile ? 'text-s' : 'text-l-light';
-  const SearchBarInputClassName = isMobile ? ' placeholder-transparent' : 'h-full';
-  const inputPlaceholder = isMobile ? 'some search' : undefined;
-
-  return (
-    <form className={`font-sans relative ${className}`}>
-      <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none">
-        <div className={LoupeIconClassName}>
-          <Img image={{ icon: 'LoupeIcon' }} width="24" height="24" />
+    return (
+      <form className={`font-sans relative ${className}`}>
+        <div className="absolute rounded h-full flex items-center justify-center pl-4 max-w-[170px] gap-3.5 pointer-events-none">
+          <div className={LoupeIconClassName}>
+            <Img image={{ icon: 'LoupeIcon' }} width="24" height="24" />
+          </div>
+          {query ? null : (
+            <label
+              htmlFor="search-bar-input"
+              className={`text-secondary-text ${SearchBarLabelClassName}`}
+            >
+              Поиск по сайту
+            </label>
+          )}
         </div>
-        {term ? null : (
-          <label
-            htmlFor="search-bar-input"
-            className={`text-secondary-text ${SearchBarLabelClassName}`}
+        <input
+          id="search-bar-input"
+          className={`h-12 pl-12 w-full peer text-l text-black border border-solid rounded-md box-border
+              outline-none pr-[6%] border-gray hover:border-primary-hover active:border-primary-text focus:border-primary-text ${SearchBarInputClassName}`}
+          value={query}
+          onChange={(e) => onChange && onChange(e.target.value || '')}
+          onFocus={onFocus}
+          type="text"
+          name="search-bar-input"
+          placeholder={inputPlaceholder}
+        />
+        {isMobile ? (
+          <button
+            className="visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none"
+            onClick={(e) => {
+              e.preventDefault();
+              onChange && onChange('');
+            }}
           >
-            Поиск по сайту
-          </label>
+            <Img image={{ icon: 'CloseIcon' }} width="24" height="24" />
+          </button>
+        ) : (
+          <Button
+            version="primary"
+            text="Найти"
+            className="invisible peer-focus:visible absolute top-[3px] right-1"
+            onClick={(ev) => {
+              ev?.preventDefault();
+              console.log('click');
+            }}
+          >
+            <div className="text-s px-9 py-2.5">Найти</div>
+          </Button>
         )}
-      </div>
-      <input
-        id="search-bar-input"
-        className={`h-12 pl-12 w-full peer text-l text-black border border-solid rounded-md box-border
-              outline-none pr-[6%] border-gray hover:border-primary-hover active:border-primary-text focus:border-primary-text ${SearchBarInputClassName}`}
-        value={term}
-        onChange={(e) => setTerm(e.target.value as string)}
-        type="text"
-        name="search-bar-input"
-        placeholder={inputPlaceholder}
-      />
-      {isMobile ? (
-        <button
-          className="visible peer-placeholder-shown:invisible absolute top-2 right-3 w-6 h-6 p-1 bg-transparent cursor-pointer border-none"
-          onClick={(e) => {
-            e.preventDefault();
-            setTerm('');
-          }}
-        >
-          <Img image={{ icon: 'CloseIcon' }} width="24" height="24" />
-        </button>
-      ) : (
-        <Button
-          version="primary"
-          text="Найти"
-          className="invisible peer-focus:visible absolute top-[3px] right-1"
-          onClick={(ev) => {
-            ev?.preventDefault();
-            console.log('click');
-          }}
-        >
-          <div className="text-s px-9 py-2.5">Найти</div>
-        </Button>
-      )}
-    </form>
-  );
-});
+      </form>
+    );
+  },
+);

package/mobile/src/utils/Comparator.ts

@@ -0,0 +1,14 @@
+export type Comparator<T> = (a: T, b: T) => number;
+
+export const compareBy =
+  <T>(indexOf: (a: T) => number): Comparator<T> =>
+  (a, b) =>
+    indexOf(a) - indexOf(b);
+
+export const desc =
+  <T>(cmp: Comparator<T>): Comparator<T> =>
+  (a, b) =>
+    -cmp(a, b);
+
+export const combineCmps = <T>(comparators: Comparator<T>[], eps = 0): Comparator<T> =>
+  comparators.reduce((cmp1, cmp2) => (a, b) => cmp1(a, b) >= eps ? cmp1(a, b) : cmp2(a, b));

package/mobile/src/utils/fetchJSON.ts

@@ -3,7 +3,7 @@ export async function fetchJSON<R = unknown>(
   options?: RequestInit,
 ): Promise<R | null> {
   try {
-    return await fetchJSONUnsafe(url, options);
+    return url ? await fetchJSONUnsafe(url, options) : null;
   } catch (err) {
     console.error(err);
   }

package/mobile/src/utils/maxBy.ts

@@ -4,3 +4,5 @@ export const maxBy =
   <Item, Value = Item>(discriminator: (item: Item) => Value = defaultDiscriminator) =>
   (list: Item[]): Item =>
     list.reduceRight((a, b) => (discriminator(a) > discriminator(b) ? a : b));
+
+export const max = maxBy<number>();