@redneckz/wildless-cms-uni-blocks 0.14.197 → 0.14.199

package/mobile/lib/ui-kit/BaseFiltration/useFiltrationForm.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useFiltrationForm.js","sourceRoot":"","sources":["../../../src/ui-kit/BaseFiltration/useFiltrationForm.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,6BAA6B,CAAC;AACtD,OAAO,EAAE,OAAO,EAA0B,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,OAAO,EAAE,GAAG,EAAE,MAAM,iBAAiB,CAAC;AACtC,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAE9C,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,gBAA2B,EAC3B,EACE,KAAK,EACL,IAAI,EACJ,SAAS,GAAG,QAAQ,GAKrB,EAQD,EAAE;IACF,MAAM,MAAM,GAAG,KAAK,EAAE,MAAM,IAAI,EAAE,CAAC;IAEnC,MAAM,CAAC,eAAe,EAAE,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE,CAAC,GACvE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAE5B,MAAM,eAAe,GAAG,OAAO,CAC7B,GAAG,EAAE,CACH,GAAG,CACD,MAAM,EACN,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC,CAChE,EACH,CAAC,MAAM,EAAE,IAAI,EAAE,QAAQ,CAAC,CACzB,CAAC;IAEF,MAAM,cAAc,GAClB,eAAe,KAAK,gBAAgB;QAClC,CAAC,CAAC,MAAM;QACR,CAAC,CAAC,YAAY,CAAC,eAAe,EAAE,eAAe,CAAC,CAAC,SAAS,CAAC,CAAC;IAEhE,OAAO;QACL,eAAe;QACf,EAAE,cAAc,EAAE,eAAe,EAAE;QACnC,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,sBAAsB,EAAE;KACjD,CAAC;AACJ,CAAC,CAAC"}

package/mobile/src/components/DepositFiltration/DepositFiltration.tsx

@@ -1,17 +1,18 @@
 import { type JSONSchema7Definition } from 'json-schema';
-import { useForm } from '../../hooks/useForm';
+import { type BlockDef } from '../../model/ContentPageDef';
 import { BaseFiltrationInner } from '../../ui-kit/BaseFiltration/BaseFiltrationInner';
-import { filterBlocks } from '../../ui-kit/BaseFiltration/filterBlocks';
 import { renderFiltrationForm } from '../../ui-kit/BaseFiltration/renderFiltrationForm';
+import { useFiltrationForm } from '../../ui-kit/BaseFiltration/useFiltrationForm';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
+import { unique } from '../../utils/unique';
 import { type DepositFiltrationContent } from './DepositFiltrationContent';
-import { getPeriod } from './getPeriod';
-import { useDepositsPeriods } from './useDepositsPeriods';
+import { isRateRow, type RateRow } from './isRateRow';
+import { numberRange } from './numberRange';
 
 interface DepositFiltrationProps extends DepositFiltrationContent, UniBlockProps {}
 
@@ -28,16 +29,16 @@ const initialFiltrationState = {
 
 export const DepositFiltration = UniBlock<DepositFiltrationProps>(
   ({ className, filtrationSchema = {}, resetButton, sumInput, periodInput, ...rest }) => {
-    const { source, months } = useDepositsPeriods(rest.block?.blocks);
-    const [filtrationState, { field, reset }] = useForm(initialFiltrationState);
-
-    const blocksToRender =
-      filtrationState === initialFiltrationState
-        ? rest.block?.blocks
-        : filterBlocks(
-            rest.block?.blocks,
-            filtrationState,
-          )((content) => ({ ...content, period: getPeriod(source, content || {}) || [] }));
+    const [, { blocksToRender, blocksWithProps }, { field, reset }] = useFiltrationForm(
+      initialFiltrationState,
+      {
+        block: rest.block,
+        page: rest.options?.page,
+        normalize: (content) => ({ ...content, period: getPeriod(content) }),
+      },
+    );
+    const rateRows = blocksWithProps.map(([, _]) => _?.paramsSource?.rateRows);
+    const months = getMonths(rateRows as Partial<RateRow>[]);
 
     const Inputs = (
       <div>
@@ -75,10 +76,25 @@ export const DepositFiltration = UniBlock<DepositFiltrationProps>(
     childrenTypes: ['ProductBlock'],
     childSchema: (content?: DepositFiltrationContent) => ({
       ...(content?.filtrationSchema || {}),
-      sourceBook: {
-        type: 'string',
+      paramsSource: {
+        type: 'object',
         title: 'Адрес справочника',
       } as JSONSchema7Definition,
     }),
   },
 );
+
+const getPeriod = (content: BlockDef['content']): number[] =>
+  unique(
+    ((content?.paramsSource?.rateRows as RateRow[] | undefined) || [])
+      .filter(isRateRow)
+      .flatMap((_) => numberRange(_.minMonths, _.maxMonths)),
+  );
+
+const getMonths = (rateRows: Partial<RateRow>[]): number[] =>
+  unique(
+    rateRows
+      .flatMap((item) => item || [])
+      .filter(isRateRow)
+      .flatMap((_) => numberRange(_.minMonths, _.maxMonths)),
+  ).sort((a, b) => a - b) || [];

package/mobile/src/components/MortgageFiltration/MortgageFiltration.tsx

@@ -1,8 +1,7 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
 import { BaseFiltrationInner } from '../../ui-kit/BaseFiltration/BaseFiltrationInner';
-import { filterBlocks } from '../../ui-kit/BaseFiltration/filterBlocks';
 import { renderFiltrationForm } from '../../ui-kit/BaseFiltration/renderFiltrationForm';
+import { useFiltrationForm } from '../../ui-kit/BaseFiltration/useFiltrationForm';
 import { useHotFilters } from '../../ui-kit/BaseFiltration/useHotFilters';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { TabsControl } from '../../ui-kit/TabsControl/TabsControl';
@@ -27,19 +26,16 @@ interface MortgageFiltrationProps extends MortgageFiltrationContent, UniBlockPro
 
 export const MortgageFiltration = UniBlock<MortgageFiltrationProps>(
   ({ className, hotFilters, filtrationSchema = {}, resetButton, ...rest }) => {
-    const [filtrationState, { field, reset, update: replaceFiltrationState }] =
-      useForm(initialFiltrationState);
-
-    const blocksToRender =
-      filtrationState === initialFiltrationState
-        ? rest.block?.blocks
-        : filterBlocks(rest.block?.blocks, filtrationState)();
-
-    const handleFiltrationStateChange = useCallback(
-      (_: MortgageFiltrationState = initialFiltrationState) => replaceFiltrationState(_),
-      [],
+    const [filtrationState, { blocksToRender }, { field, reset, update }] = useFiltrationForm(
+      initialFiltrationState,
+      {
+        block: rest.block,
+        page: rest.options?.page,
+      },
     );
 
+    const handleFiltrationStateChange = useCallback((_ = initialFiltrationState) => update(_), []);
+
     const tabsControlProps = useHotFilters({
       hotFilters,
       filtrationState,

package/mobile/src/content-page-repository/replaceHeadingTags.ts

@@ -1,2 +1,2 @@
 export const replaceHeadingTags = (html: string) =>
-  html.replaceAll(/<h(\d)>([^<]*)<\/h\d>/g, '<p class="h$1">$2</p>');
+  html.replaceAll(/<h(\d)>(.*)<\/h\d>/g, '<p class="h$1">$2</p>');

package/mobile/src/hooks/useForm.ts

@@ -17,19 +17,18 @@ export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = For
   options?: Options<V, FormState[N]>,
 ) => FieldProps<V extends undefined ? FormState[N] : V>;
 
+export interface FormOperatorProps<FormState extends Record<string, any>> {
+  isDirty?: boolean;
+  field: FormFieldRegisterer<FormState>;
+  update: (_: FormState) => void;
+  reset: () => void;
+  onSubmit?: (e: PreventableEvent) => void;
+}
+
 export const useForm = <FormState extends Record<string, any>>(
   initialState: FormState,
   { resetOnSubmit, onSubmit }: { resetOnSubmit?: boolean; onSubmit?: (_: FormState) => void } = {},
-): [
-  FormState,
-  {
-    isDirty: boolean;
-    field: FormFieldRegisterer<FormState>;
-    update: (_: FormState) => void;
-    reset: () => void;
-    onSubmit: (e: PreventableEvent) => void;
-  },
-] => {
+): [FormState, FormOperatorProps<FormState>] => {
   const [formState, setFormState] = useState<FormState>(initialState);
 
   const [isDirtyForm, setDirtyForm] = useState(false);

package/mobile/src/hooks/useJSONRef/resolveBlockProps.ts

@@ -0,0 +1,4 @@
+import { resolveRefSync, type JSONNode } from '@redneckz/json-ref';
+
+export const resolveBlockProps = <C>(content: C, fallback?: Record<string, unknown>): C =>
+  resolveRefSync(content as JSONNode, (_) => fallback?.[_] as JSONNode) as C;

package/mobile/src/hooks/useJSONRef/useJSONRef.ts

@@ -1,6 +1,7 @@
-import { collectRef, resolveRefSync, type JSONNode } from '@redneckz/json-ref';
+import { collectRef, type JSONNode } from '@redneckz/json-ref';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { fetchRefs } from './fetchRefs';
+import { resolveBlockProps } from './resolveBlockProps';
 
 export const useJSONRef = <C>(content: C, fallback?: Record<string, unknown>): C => {
   const refs = collectRef(content as JSONNode);
@@ -12,7 +13,5 @@ export const useJSONRef = <C>(content: C, fallback?: Record<string, unknown>): C
     }
   }, [refs.join()]);
 
-  return refs.length
-    ? (resolveRefSync(content as JSONNode, (_) => refsMap[_] || (fallback?.[_] as JSONNode)) as C)
-    : content;
+  return refs.length ? resolveBlockProps(content, { ...fallback, ...refsMap }) : content;
 };

package/mobile/src/ui-kit/BaseFiltration/filterBlocks.ts

@@ -3,6 +3,11 @@ import { identity } from '../../utils/identity';
 import { targetMatchPattern } from './targetMatchPattern';
 
 export const filterBlocks =
-  (blocks: BlockDef[] | undefined, filtrationState: Record<string, any>) =>
-  (normalize = identity) =>
-    blocks && blocks.filter((b) => targetMatchPattern(filtrationState, normalize(b.content || {})));
+  (
+    blocksWithProps: [BlockDef, Record<string, any> | undefined][],
+    filtrationState: Record<string, any>,
+  ) =>
+  (normalize: (content: BlockDef['content']) => BlockDef['content'] = identity) =>
+    blocksWithProps
+      ?.filter(([, content]) => targetMatchPattern(filtrationState, normalize(content) || {}))
+      .map(([block]) => block);

package/mobile/src/ui-kit/BaseFiltration/useFiltrationForm.ts

@@ -0,0 +1,52 @@
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm, type FormOperatorProps } from '../../hooks/useForm';
+import { resolveBlockProps } from '../../hooks/useJSONRef/resolveBlockProps';
+import { type BlockDef, type ContentPageDef } from '../../model/ContentPageDef';
+import { identity } from '../../utils/identity';
+import { zip } from '../../utils/zip';
+import { filterBlocks } from './filterBlocks';
+
+export const useFiltrationForm = <FormState extends Record<string, any>>(
+  initialFormState: FormState,
+  {
+    block,
+    page,
+    normalize = identity,
+  }: {
+    block?: BlockDef;
+    page?: ContentPageDef;
+    normalize?: (content: BlockDef['content']) => BlockDef['content'];
+  },
+): [
+  FormState,
+  {
+    blocksToRender: BlockDef[] | undefined;
+    blocksWithProps: [BlockDef, Record<string, any> | undefined][];
+  },
+  FormOperatorProps<FormState>,
+] => {
+  const blocks = block?.blocks || [];
+
+  const [filtrationState, { field, reset, update: replaceFiltrationState }] =
+    useForm(initialFormState);
+
+  const blocksWithProps = useMemo(
+    () =>
+      zip(
+        blocks,
+        blocks.map((b) => resolveBlockProps(b.content, page?.fallback)),
+      ),
+    [blocks, page?.fallback],
+  );
+
+  const blocksToRender =
+    filtrationState === initialFormState
+      ? blocks
+      : filterBlocks(blocksWithProps, filtrationState)(normalize);
+
+  return [
+    filtrationState,
+    { blocksToRender, blocksWithProps },
+    { field, reset, update: replaceFiltrationState },
+  ];
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@redneckz/wildless-cms-uni-blocks",
-  "version": "0.14.197",
+  "version": "0.14.199",
   "private": false,
   "license": "MIT",
   "author": "ЦК",

package/src/components/DepositFiltration/DepositFiltration.fixture.mobile.tsx

@@ -124,7 +124,7 @@ export default {
                 sum: { min: 500, max: 500000 },
               },
               {
-                sourceBook: 'product-block-data',
+                paramsSource: { $ref: '/wcms-resources/product-block-3-data.json' },
               },
             ),
             generateBlock(
@@ -137,7 +137,7 @@ export default {
                 sum: { min: 500, max: 10000 },
               },
               {
-                sourceBook: 'product-block-2-data',
+                paramsSource: { $ref: '/wcms-resources/product-block-2-data.json' },
               },
             ),
             generateBlock(
@@ -150,7 +150,7 @@ export default {
                 sum: { min: 1000, max: 100000 },
               },
               {
-                sourceBook: 'product-block-data',
+                paramsSource: { $ref: '/wcms-resources/product-block-data.json' },
               },
             ),
           ],

package/src/components/DepositFiltration/DepositFiltration.fixture.tsx

@@ -91,6 +91,13 @@ const SCHEMA: DepositFiltrationContent['filtrationSchema'] = {
 
 const options = {
   blocksRegistry: Blocks,
+  page: {
+    fallback: {
+      ['/wcms-resources/product-block-data.json']: require('../../../cosmos-static/wcms-resources/product-block-data.json'),
+      ['/wcms-resources/product-block-2-data.json']: require('../../../cosmos-static/wcms-resources/product-block-2-data.json'),
+      ['/wcms-resources/product-block-3-data.json']: require('../../../cosmos-static/wcms-resources/product-block-3-data.json'),
+    },
+  },
 } as BlockRendererOptions;
 
 export default {
@@ -120,7 +127,7 @@ export default {
                 sum: { min: 100, max: 500 },
               },
               {
-                sourceBook: 'product-block-data',
+                paramsSource: { $ref: '/wcms-resources/product-block-data.json' },
               },
             ),
             generateBlock(
@@ -132,7 +139,7 @@ export default {
                 sum: { min: 500, max: 10000 },
               },
               {
-                sourceBook: 'product-block-2-data',
+                paramsSource: { $ref: '/wcms-resources/product-block-2-data.json' },
               },
             ),
             generateBlock(
@@ -144,7 +151,7 @@ export default {
                 sum: { min: 1000, max: 100000 },
               },
               {
-                sourceBook: 'product-block-3-data',
+                paramsSource: { $ref: '/wcms-resources/product-block-3-data.json' },
               },
             ),
           ],

package/src/components/DepositFiltration/DepositFiltration.tsx

@@ -1,17 +1,18 @@
 import { type JSONSchema7Definition } from 'json-schema';
-import { useForm } from '../../hooks/useForm';
+import { type BlockDef } from '../../model/ContentPageDef';
 import { BaseFiltrationInner } from '../../ui-kit/BaseFiltration/BaseFiltrationInner';
-import { filterBlocks } from '../../ui-kit/BaseFiltration/filterBlocks';
 import { renderFiltrationForm } from '../../ui-kit/BaseFiltration/renderFiltrationForm';
+import { useFiltrationForm } from '../../ui-kit/BaseFiltration/useFiltrationForm';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { CurrencyInput } from '../../ui-kit/CurrencyInput/CurrencyInput';
 import { InputRange } from '../../ui-kit/InputRange/InputRange';
 import { UniBlock } from '../../UniBlock/UniBlock';
 import { type UniBlockProps } from '../../UniBlock/UniBlockProps';
 import { style } from '../../utils/style';
+import { unique } from '../../utils/unique';
 import { type DepositFiltrationContent } from './DepositFiltrationContent';
-import { getPeriod } from './getPeriod';
-import { useDepositsPeriods } from './useDepositsPeriods';
+import { isRateRow, type RateRow } from './isRateRow';
+import { numberRange } from './numberRange';
 
 interface DepositFiltrationProps extends DepositFiltrationContent, UniBlockProps {}
 
@@ -28,16 +29,16 @@ const initialFiltrationState = {
 
 export const DepositFiltration = UniBlock<DepositFiltrationProps>(
   ({ className, filtrationSchema = {}, resetButton, sumInput, periodInput, ...rest }) => {
-    const { source, months } = useDepositsPeriods(rest.block?.blocks);
-    const [filtrationState, { field, reset }] = useForm(initialFiltrationState);
-
-    const blocksToRender =
-      filtrationState === initialFiltrationState
-        ? rest.block?.blocks
-        : filterBlocks(
-            rest.block?.blocks,
-            filtrationState,
-          )((content) => ({ ...content, period: getPeriod(source, content || {}) || [] }));
+    const [, { blocksToRender, blocksWithProps }, { field, reset }] = useFiltrationForm(
+      initialFiltrationState,
+      {
+        block: rest.block,
+        page: rest.options?.page,
+        normalize: (content) => ({ ...content, period: getPeriod(content) }),
+      },
+    );
+    const rateRows = blocksWithProps.map(([, _]) => _?.paramsSource?.rateRows);
+    const months = getMonths(rateRows as Partial<RateRow>[]);
 
     const Inputs = (
       <div>
@@ -75,10 +76,25 @@ export const DepositFiltration = UniBlock<DepositFiltrationProps>(
     childrenTypes: ['ProductBlock'],
     childSchema: (content?: DepositFiltrationContent) => ({
       ...(content?.filtrationSchema || {}),
-      sourceBook: {
-        type: 'string',
+      paramsSource: {
+        type: 'object',
         title: 'Адрес справочника',
       } as JSONSchema7Definition,
     }),
   },
 );
+
+const getPeriod = (content: BlockDef['content']): number[] =>
+  unique(
+    ((content?.paramsSource?.rateRows as RateRow[] | undefined) || [])
+      .filter(isRateRow)
+      .flatMap((_) => numberRange(_.minMonths, _.maxMonths)),
+  );
+
+const getMonths = (rateRows: Partial<RateRow>[]): number[] =>
+  unique(
+    rateRows
+      .flatMap((item) => item || [])
+      .filter(isRateRow)
+      .flatMap((_) => numberRange(_.minMonths, _.maxMonths)),
+  ).sort((a, b) => a - b) || [];

package/src/components/MortgageFiltration/MortgageFiltration.tsx

@@ -1,8 +1,7 @@
 import { useCallback } from '@redneckz/uni-jsx/lib/hooks';
-import { useForm } from '../../hooks/useForm';
 import { BaseFiltrationInner } from '../../ui-kit/BaseFiltration/BaseFiltrationInner';
-import { filterBlocks } from '../../ui-kit/BaseFiltration/filterBlocks';
 import { renderFiltrationForm } from '../../ui-kit/BaseFiltration/renderFiltrationForm';
+import { useFiltrationForm } from '../../ui-kit/BaseFiltration/useFiltrationForm';
 import { useHotFilters } from '../../ui-kit/BaseFiltration/useHotFilters';
 import { BlockWrapper } from '../../ui-kit/BlockWrapper';
 import { TabsControl } from '../../ui-kit/TabsControl/TabsControl';
@@ -27,19 +26,16 @@ interface MortgageFiltrationProps extends MortgageFiltrationContent, UniBlockPro
 
 export const MortgageFiltration = UniBlock<MortgageFiltrationProps>(
   ({ className, hotFilters, filtrationSchema = {}, resetButton, ...rest }) => {
-    const [filtrationState, { field, reset, update: replaceFiltrationState }] =
-      useForm(initialFiltrationState);
-
-    const blocksToRender =
-      filtrationState === initialFiltrationState
-        ? rest.block?.blocks
-        : filterBlocks(rest.block?.blocks, filtrationState)();
-
-    const handleFiltrationStateChange = useCallback(
-      (_: MortgageFiltrationState = initialFiltrationState) => replaceFiltrationState(_),
-      [],
+    const [filtrationState, { blocksToRender }, { field, reset, update }] = useFiltrationForm(
+      initialFiltrationState,
+      {
+        block: rest.block,
+        page: rest.options?.page,
+      },
     );
 
+    const handleFiltrationStateChange = useCallback((_ = initialFiltrationState) => update(_), []);
+
     const tabsControlProps = useHotFilters({
       hotFilters,
       filtrationState,

package/src/content-page-repository/replaceHeadingTags.ts

@@ -1,2 +1,2 @@
 export const replaceHeadingTags = (html: string) =>
-  html.replaceAll(/<h(\d)>([^<]*)<\/h\d>/g, '<p class="h$1">$2</p>');
+  html.replaceAll(/<h(\d)>(.*)<\/h\d>/g, '<p class="h$1">$2</p>');

package/src/hooks/useForm.ts

@@ -17,19 +17,18 @@ export type FormFieldRegisterer<FormState> = <N extends keyof FormState, V = For
   options?: Options<V, FormState[N]>,
 ) => FieldProps<V extends undefined ? FormState[N] : V>;
 
+export interface FormOperatorProps<FormState extends Record<string, any>> {
+  isDirty?: boolean;
+  field: FormFieldRegisterer<FormState>;
+  update: (_: FormState) => void;
+  reset: () => void;
+  onSubmit?: (e: PreventableEvent) => void;
+}
+
 export const useForm = <FormState extends Record<string, any>>(
   initialState: FormState,
   { resetOnSubmit, onSubmit }: { resetOnSubmit?: boolean; onSubmit?: (_: FormState) => void } = {},
-): [
-  FormState,
-  {
-    isDirty: boolean;
-    field: FormFieldRegisterer<FormState>;
-    update: (_: FormState) => void;
-    reset: () => void;
-    onSubmit: (e: PreventableEvent) => void;
-  },
-] => {
+): [FormState, FormOperatorProps<FormState>] => {
   const [formState, setFormState] = useState<FormState>(initialState);
 
   const [isDirtyForm, setDirtyForm] = useState(false);

package/src/hooks/useJSONRef/resolveBlockProps.ts

@@ -0,0 +1,4 @@
+import { resolveRefSync, type JSONNode } from '@redneckz/json-ref';
+
+export const resolveBlockProps = <C>(content: C, fallback?: Record<string, unknown>): C =>
+  resolveRefSync(content as JSONNode, (_) => fallback?.[_] as JSONNode) as C;

package/src/hooks/useJSONRef/useJSONRef.ts

@@ -1,6 +1,7 @@
-import { collectRef, resolveRefSync, type JSONNode } from '@redneckz/json-ref';
+import { collectRef, type JSONNode } from '@redneckz/json-ref';
 import { useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { fetchRefs } from './fetchRefs';
+import { resolveBlockProps } from './resolveBlockProps';
 
 export const useJSONRef = <C>(content: C, fallback?: Record<string, unknown>): C => {
   const refs = collectRef(content as JSONNode);
@@ -12,7 +13,5 @@ export const useJSONRef = <C>(content: C, fallback?: Record<string, unknown>): C
     }
   }, [refs.join()]);
 
-  return refs.length
-    ? (resolveRefSync(content as JSONNode, (_) => refsMap[_] || (fallback?.[_] as JSONNode)) as C)
-    : content;
+  return refs.length ? resolveBlockProps(content, { ...fallback, ...refsMap }) : content;
 };

package/src/ui-kit/BaseFiltration/filterBlocks.ts

@@ -3,6 +3,11 @@ import { identity } from '../../utils/identity';
 import { targetMatchPattern } from './targetMatchPattern';
 
 export const filterBlocks =
-  (blocks: BlockDef[] | undefined, filtrationState: Record<string, any>) =>
-  (normalize = identity) =>
-    blocks && blocks.filter((b) => targetMatchPattern(filtrationState, normalize(b.content || {})));
+  (
+    blocksWithProps: [BlockDef, Record<string, any> | undefined][],
+    filtrationState: Record<string, any>,
+  ) =>
+  (normalize: (content: BlockDef['content']) => BlockDef['content'] = identity) =>
+    blocksWithProps
+      ?.filter(([, content]) => targetMatchPattern(filtrationState, normalize(content) || {}))
+      .map(([block]) => block);

package/src/ui-kit/BaseFiltration/useFiltrationForm.ts

@@ -0,0 +1,52 @@
+import { useMemo } from '@redneckz/uni-jsx/lib/hooks';
+import { useForm, type FormOperatorProps } from '../../hooks/useForm';
+import { resolveBlockProps } from '../../hooks/useJSONRef/resolveBlockProps';
+import { type BlockDef, type ContentPageDef } from '../../model/ContentPageDef';
+import { identity } from '../../utils/identity';
+import { zip } from '../../utils/zip';
+import { filterBlocks } from './filterBlocks';
+
+export const useFiltrationForm = <FormState extends Record<string, any>>(
+  initialFormState: FormState,
+  {
+    block,
+    page,
+    normalize = identity,
+  }: {
+    block?: BlockDef;
+    page?: ContentPageDef;
+    normalize?: (content: BlockDef['content']) => BlockDef['content'];
+  },
+): [
+  FormState,
+  {
+    blocksToRender: BlockDef[] | undefined;
+    blocksWithProps: [BlockDef, Record<string, any> | undefined][];
+  },
+  FormOperatorProps<FormState>,
+] => {
+  const blocks = block?.blocks || [];
+
+  const [filtrationState, { field, reset, update: replaceFiltrationState }] =
+    useForm(initialFormState);
+
+  const blocksWithProps = useMemo(
+    () =>
+      zip(
+        blocks,
+        blocks.map((b) => resolveBlockProps(b.content, page?.fallback)),
+      ),
+    [blocks, page?.fallback],
+  );
+
+  const blocksToRender =
+    filtrationState === initialFormState
+      ? blocks
+      : filterBlocks(blocksWithProps, filtrationState)(normalize);
+
+  return [
+    filtrationState,
+    { blocksToRender, blocksWithProps },
+    { field, reset, update: replaceFiltrationState },
+  ];
+};

package/bundle/components/DepositFiltration/SourceItem.d.ts

@@ -1,4 +0,0 @@
-import { type RateRow } from './isRateRow';
-export interface SourceItem {
-    rateRows?: Partial<RateRow>[];
-}

package/bundle/components/DepositFiltration/getChildSourceBook.d.ts

@@ -1,2 +0,0 @@
-import { type BlockDef } from '../../model/ContentPageDef';
-export declare const getChildSourceBook: (blocks: BlockDef[] | undefined) => string[] | undefined;

package/bundle/components/DepositFiltration/getPeriod.d.ts

@@ -1,4 +0,0 @@
-import { type SourceItem } from './SourceItem';
-declare type Source = Record<string, SourceItem | null>;
-export declare const getPeriod: (source: Source, content: Record<string, any>) => number[];
-export {};

package/bundle/components/DepositFiltration/useDepositsPeriods.d.ts

@@ -1,8 +0,0 @@
-import { type BlockDef } from '../../model/ContentPageDef';
-import { type SourceItem } from './SourceItem';
-export declare function useDepositsPeriods(blocks: BlockDef[] | undefined): {
-    source: {
-        [k: string]: SourceItem | null;
-    };
-    months: number[];
-};

package/dist/components/DepositFiltration/SourceItem.d.ts

@@ -1,4 +0,0 @@
-import { type RateRow } from './isRateRow';
-export interface SourceItem {
-    rateRows?: Partial<RateRow>[];
-}

package/dist/components/DepositFiltration/SourceItem.js

@@ -1,2 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-//# sourceMappingURL=SourceItem.js.map

package/dist/components/DepositFiltration/SourceItem.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"SourceItem.js","sourceRoot":"","sources":["../../../src/components/DepositFiltration/SourceItem.ts"],"names":[],"mappings":""}

package/dist/components/DepositFiltration/getChildSourceBook.d.ts

@@ -1,2 +0,0 @@
-import { type BlockDef } from '../../model/ContentPageDef';
-export declare const getChildSourceBook: (blocks: BlockDef[] | undefined) => string[] | undefined;

package/dist/components/DepositFiltration/getChildSourceBook.js

@@ -1,6 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getChildSourceBook = void 0;
-const getChildSourceBook = (blocks) => blocks?.filter(hasSourceBook).map(({ content: { sourceBook } }) => sourceBook);
-exports.getChildSourceBook = getChildSourceBook;
-const hasSourceBook = (block) => Boolean(block && block.content && typeof block.content.sourceBook === 'string');
-//# sourceMappingURL=getChildSourceBook.js.map

package/dist/components/DepositFiltration/getChildSourceBook.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getChildSourceBook.js","sourceRoot":"","sources":["../../../src/components/DepositFiltration/getChildSourceBook.ts"],"names":[],"mappings":";;AAEO,MAAM,kBAAkB,GAAG,CAAC,MAA8B,EAAE,EAAE,CACnE,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,UAAU,EAAE,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,CAAC;AADpE,QAAA,kBAAkB,sBACkD;AAEjF,MAAM,aAAa,GAAG,CAAC,KAAe,EAA2D,EAAE,CACjG,OAAO,CAAC,KAAK,IAAI,KAAK,CAAC,OAAO,IAAI,OAAO,KAAK,CAAC,OAAO,CAAC,UAAU,KAAK,QAAQ,CAAC,CAAC"}

package/dist/components/DepositFiltration/getPeriod.d.ts

@@ -1,4 +0,0 @@
-import { type SourceItem } from './SourceItem';
-declare type Source = Record<string, SourceItem | null>;
-export declare const getPeriod: (source: Source, content: Record<string, any>) => number[];
-export {};