@redneckz/wildless-cms-uni-blocks 0.13.5 → 0.13.7

package/src/ui-kit/BaseFiltration/renderFiltrationForm.tsx

@@ -29,7 +29,7 @@ export const renderFiltrationForm = ({
   resetButton,
   children,
 }: RenderFiltrationFormProps) => (
-  <form className="flex justify-between bg-white p-4xl mb-2xs">
+  <form className="flex justify-between bg-white p-4xl">
     <div className="flex gap-5xl">
       {children}
       {Object.entries(filtrationSchema).map(renderFormItem(field))}

package/src/ui-kit/BaseFiltration/useHotFilters.tsx

@@ -0,0 +1,65 @@
+import { useCallback, useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import type { BlockDef } from '../../model/ContentPageDef';
+import { Badge } from '../Badge/Badge';
+import type { TabItemBase } from '../TabsControl/TabItem';
+import type { TabsControlProps } from '../TabsControl/TabsControlProps';
+import { getBadgeCount } from './getBadgeCount';
+import { HotFilterBase } from './HotFilterBase';
+import { hotFilterRecordCmp } from './hotFilterRecordCmp';
+
+const EMPTY_ARR = [];
+const EMPTY_OBJ = {};
+
+export type BaseFilter = HotFilterBase & {
+  filter?: Record<string, string[]>;
+};
+
+interface UseHotFiltersParams {
+  hotFilters?: BaseFilter[];
+  filtrationState?: Record<string, string[]>;
+  blocks?: BlockDef[];
+  onFiltrationStateChange: (_?: Record<string, string[]>) => void;
+}
+
+export const useHotFilters = ({
+  hotFilters = EMPTY_ARR,
+  filtrationState = EMPTY_OBJ,
+  blocks = EMPTY_ARR,
+  onFiltrationStateChange,
+}: UseHotFiltersParams): TabsControlProps => {
+  const activeItemIndex = useMemo(
+    () =>
+      Math.max(
+        0,
+        hotFilters.findIndex((_) => hotFilterRecordCmp(_.filter, filtrationState)),
+      ),
+    [hotFilters, filtrationState],
+  );
+
+  const items: TabItemBase[] = useMemo(
+    () =>
+      hotFilters.map((_) => ({
+        text: _.text,
+        appendRight: (
+          <Badge
+            version={_ === hotFilters[activeItemIndex] ? 'primary' : 'secondary'}
+            count={getBadgeCount(blocks, _.filter)}
+          />
+        ),
+      })),
+    [hotFilters, blocks, activeItemIndex],
+  );
+
+  const handleChange = useCallback(
+    (_: TabItemBase) => {
+      onFiltrationStateChange(hotFilters[items.indexOf(_)].filter);
+    },
+    [hotFilters, items],
+  );
+
+  return {
+    value: items[activeItemIndex],
+    items: items,
+    onChange: handleChange,
+  };
+};

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

@@ -66,20 +66,11 @@ export const BaseTile = JSX<BaseTileProps>(
 const renderImageContainer = (
   image: VNode | undefined,
   { className, imageAlign }: { className?: string; imageAlign?: Align },
-) => {
-  //TODO Спорное решение
-  const fullWidth = image?.props?.image?.size?.width > 400;
-
-  return image ? (
+) =>
+  image ? (
     <div
-      className={style(
-        'flex-shrink-0',
-        fullWidth ? 'w-full @xl:w-auto' : '',
-        imageAlign && imageAlignmentMap[imageAlign],
-        className,
-      )}
+      className={style('md:flex-shrink-0', imageAlign && imageAlignmentMap[imageAlign], className)}
     >
       {image}
     </div>
   ) : null;
-};

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

@@ -1,49 +1,24 @@
 import { JSX } from '@redneckz/uni-jsx';
 import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
-import { defaultEventBus } from '../../EventBus/defaultEventBus';
-import { useList } from '../../hooks/useList';
-import { assertUnreachable } from '../../utils/assertUnreachable';
 import { style } from '../../utils/style';
 import type { DialogOpenAction } from './DialogAction';
+import { useDialogManager } from './useDialogManager';
+import { useDialogsList } from './useDialogsList';
 
 export const DialogManager = JSX(() => {
-  const [dialogs, { push, pop, clear }] = useList<DialogOpenAction>();
-
-  const closeAll = useCallback(() => {
+  const handleCloseAll = useCallback((dialogs: DialogOpenAction[]) => {
     for (const _ of dialogs) {
-      _.onClose && _.onClose();
+      _?.onClose && _.onClose();
     }
+  }, []);
 
-    clear();
-  }, [dialogs]);
-
-  const close = useCallback(() => {
-    const _ = dialogs[dialogs.length - 1];
+  const handleClose = useCallback((_: DialogOpenAction) => {
     _?.onClose && _.onClose();
+  }, []);
 
-    pop();
-  }, [dialogs]);
+  const dialogs = useDialogsList({ onCloseAll: handleCloseAll, onClose: handleClose });
 
-  useEffect(
-    () =>
-      defaultEventBus.subscribe('dialog', (action) => {
-        switch (action.type) {
-          case 'open':
-            push(action);
-            break;
-          case 'close':
-            if (action.all) {
-              closeAll();
-            } else {
-              close();
-            }
-            break;
-          default:
-            assertUnreachable(action);
-        }
-      }),
-    [closeAll, close],
-  );
+  const { close } = useDialogManager();
 
   useEffect(() => {
     const handleEscape = ({ key }: { key: string }) => {

package/src/ui-kit/DialogManager/useDialogsList.ts

@@ -0,0 +1,50 @@
+import { useCallback, useEffect } from '@redneckz/uni-jsx/lib/hooks';
+import { defaultEventBus } from '../../EventBus/defaultEventBus';
+import { useList } from '../../hooks/useList';
+import { assertUnreachable } from '../../utils/assertUnreachable';
+import type { DialogOpenAction } from './DialogAction';
+
+interface DialogsListOptions {
+  onCloseAll?: (dialogs: DialogOpenAction[]) => void;
+  onClose?: (_: DialogOpenAction) => void;
+}
+
+export const useDialogsList = ({
+  onCloseAll,
+  onClose,
+}: DialogsListOptions = {}): DialogOpenAction[] => {
+  const [dialogs, { push, pop, clear }] = useList<DialogOpenAction>();
+
+  const closeAll = useCallback(() => {
+    onCloseAll && onCloseAll(dialogs);
+    clear();
+  }, [dialogs, onCloseAll]);
+
+  const close = useCallback(() => {
+    onClose && onClose(dialogs[dialogs.length - 1]);
+    pop();
+  }, [dialogs, onClose]);
+
+  useEffect(
+    () =>
+      defaultEventBus.subscribe('dialog', (action) => {
+        switch (action.type) {
+          case 'open':
+            push(action);
+            break;
+          case 'close':
+            if (action.all) {
+              closeAll();
+            } else {
+              close();
+            }
+            break;
+          default:
+            assertUnreachable(action);
+        }
+      }),
+    [closeAll, close],
+  );
+
+  return dialogs;
+};

package/src/ui-kit/TabsControl/TabItem.tsx

@@ -2,18 +2,20 @@ import { JSX } from '@redneckz/uni-jsx';
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
 import { useLink } from '../../hooks/useLink';
 import type { LinkProps } from '../../model/LinkProps';
+import type { VNode } from '../../model/VNode';
 import { TabItemInner } from './TabItemInner';
 import type { TabsControlProps } from './TabsControlProps';
-
-export type TabItemBase = LinkProps;
+export interface TabItemBase extends LinkProps {
+  appendRight?: VNode;
+}
 
 export type TabType = 'default' | 'underlined' | 'rounded';
 
 export interface TabItemProps {
   item?: TabItemBase;
   isActive?: boolean;
-  onClick?: TabsControlProps['onChange'];
   type?: TabType;
+  onClick?: TabsControlProps['onChange'];
 }
 
 export const TabItem = JSX<TabItemProps>((props) =>

package/src/ui-kit/TabsControl/TabItemInner.tsx

@@ -37,7 +37,7 @@ export const TabItemInner = JSX<TabItemInnerProps>(
   ({ tag = 'div', item = {}, isActive, type = 'default', onClick }) => {
     const Tag: any = tag;
 
-    const { text, ...link } = item;
+    const { text, appendRight, ...link } = item;
 
     return (
       <Tag
@@ -62,6 +62,7 @@ export const TabItemInner = JSX<TabItemInnerProps>(
           )}
         >
           <Text size="text-m">{text}</Text>
+          {appendRight ? <div className="ml-xs">{appendRight}</div> : null}
         </div>
       </Tag>
     );

package/bundle/components/MortgageFiltration/HotFilterRecord.d.ts

@@ -1,11 +0,0 @@
-export declare type HotFilterRecord = {
-    /** @title Тип недвижимости */
-    propertyType?: string[];
-    /** @title Этап строительства */
-    stage?: string[];
-    /** @title Категории */
-    categories?: string[];
-    /** @title Дополнительно */
-    extraOptions?: string[];
-};
-export declare const hotFilterRecordCmp: (a: Record<string, string[]> | null | undefined, b: Record<string, string[]> | null | undefined) => boolean;

package/dist/components/MortgageFiltration/HotFilterRecord.d.ts

@@ -1,11 +0,0 @@
-export declare type HotFilterRecord = {
-    /** @title Тип недвижимости */
-    propertyType?: string[];
-    /** @title Этап строительства */
-    stage?: string[];
-    /** @title Категории */
-    categories?: string[];
-    /** @title Дополнительно */
-    extraOptions?: string[];
-};
-export declare const hotFilterRecordCmp: (a: Record<string, string[]> | null | undefined, b: Record<string, string[]> | null | undefined) => boolean;

package/dist/components/MortgageFiltration/HotFilterRecord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HotFilterRecord.js","sourceRoot":"","sources":["../../../src/components/MortgageFiltration/HotFilterRecord.ts"],"names":[],"mappings":";;AAAA,+DAAwF;AAa3E,QAAA,kBAAkB,GAAG,IAAA,uBAAM,EAAW,IAAA,gCAAe,EAAC,0BAAS,EAAE,IAAA,uBAAM,GAAE,CAAC,CAAC,CAAC"}

package/lib/components/MortgageFiltration/HotFilterRecord.d.ts

@@ -1,11 +0,0 @@
-export declare type HotFilterRecord = {
-    /** @title Тип недвижимости */
-    propertyType?: string[];
-    /** @title Этап строительства */
-    stage?: string[];
-    /** @title Категории */
-    categories?: string[];
-    /** @title Дополнительно */
-    extraOptions?: string[];
-};
-export declare const hotFilterRecordCmp: (a: Record<string, string[]> | null | undefined, b: Record<string, string[]> | null | undefined) => boolean;

package/lib/components/MortgageFiltration/HotFilterRecord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HotFilterRecord.js","sourceRoot":"","sources":["../../../src/components/MortgageFiltration/HotFilterRecord.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAaxF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAW,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC"}

package/mobile/bundle/components/MortgageFiltration/HotFilterRecord.d.ts

@@ -1,11 +0,0 @@
-export declare type HotFilterRecord = {
-    /** @title Тип недвижимости */
-    propertyType?: string[];
-    /** @title Этап строительства */
-    stage?: string[];
-    /** @title Категории */
-    categories?: string[];
-    /** @title Дополнительно */
-    extraOptions?: string[];
-};
-export declare const hotFilterRecordCmp: (a: Record<string, string[]> | null | undefined, b: Record<string, string[]> | null | undefined) => boolean;

package/mobile/dist/components/MortgageFiltration/HotFilterRecord.d.ts

@@ -1,11 +0,0 @@
-export declare type HotFilterRecord = {
-    /** @title Тип недвижимости */
-    propertyType?: string[];
-    /** @title Этап строительства */
-    stage?: string[];
-    /** @title Категории */
-    categories?: string[];
-    /** @title Дополнительно */
-    extraOptions?: string[];
-};
-export declare const hotFilterRecordCmp: (a: Record<string, string[]> | null | undefined, b: Record<string, string[]> | null | undefined) => boolean;

package/mobile/dist/components/MortgageFiltration/HotFilterRecord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HotFilterRecord.js","sourceRoot":"","sources":["../../../src/components/MortgageFiltration/HotFilterRecord.ts"],"names":[],"mappings":";;AAAA,+DAAwF;AAa3E,QAAA,kBAAkB,GAAG,IAAA,uBAAM,EAAW,IAAA,gCAAe,EAAC,0BAAS,EAAE,IAAA,uBAAM,GAAE,CAAC,CAAC,CAAC"}

package/mobile/lib/components/MortgageFiltration/HotFilterRecord.d.ts

@@ -1,11 +0,0 @@
-export declare type HotFilterRecord = {
-    /** @title Тип недвижимости */
-    propertyType?: string[];
-    /** @title Этап строительства */
-    stage?: string[];
-    /** @title Категории */
-    categories?: string[];
-    /** @title Дополнительно */
-    extraOptions?: string[];
-};
-export declare const hotFilterRecordCmp: (a: Record<string, string[]> | null | undefined, b: Record<string, string[]> | null | undefined) => boolean;

package/mobile/lib/components/MortgageFiltration/HotFilterRecord.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"HotFilterRecord.js","sourceRoot":"","sources":["../../../src/components/MortgageFiltration/HotFilterRecord.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAaxF,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAW,eAAe,CAAC,SAAS,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC"}

package/mobile/src/components/MortgageFiltration/HotFilterRecord.ts

@@ -1,14 +0,0 @@
-import { arrCmp, combineBoolCmps, objCmp, scalarCmp } from '../../utils/BoolComparator';
-
-export type HotFilterRecord = {
-  /** @title Тип недвижимости */
-  propertyType?: string[];
-  /** @title Этап строительства */
-  stage?: string[];
-  /** @title Категории */
-  categories?: string[];
-  /** @title Дополнительно */
-  extraOptions?: string[];
-};
-
-export const hotFilterRecordCmp = objCmp<string[]>(combineBoolCmps(scalarCmp, arrCmp()));

package/src/components/MortgageFiltration/HotFilterRecord.ts

@@ -1,14 +0,0 @@
-import { arrCmp, combineBoolCmps, objCmp, scalarCmp } from '../../utils/BoolComparator';
-
-export type HotFilterRecord = {
-  /** @title Тип недвижимости */
-  propertyType?: string[];
-  /** @title Этап строительства */
-  stage?: string[];
-  /** @title Категории */
-  categories?: string[];
-  /** @title Дополнительно */
-  extraOptions?: string[];
-};
-
-export const hotFilterRecordCmp = objCmp<string[]>(combineBoolCmps(scalarCmp, arrCmp()));