@redneckz/wildless-cms-uni-blocks 0.14.23 → 0.14.25
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/migration-scripts/0.14.24.js +29 -0
- package/bundle/bundle.umd.js +34 -7
- package/bundle/bundle.umd.min.js +1 -1
- package/bundle/components/Tabs/Tabs.d.ts +1 -1
- package/bundle/hooks/useRouter.d.ts +1 -0
- package/bundle/ui-kit/TabsControl/TabItem.d.ts +1 -0
- package/bundle/utils/deleteAllCookie.d.ts +1 -0
- package/dist/components/ApplicationForm/ApplicationFormGrantSupport.js +1 -1
- package/dist/components/ApplicationForm/ApplicationFormGrantSupport.js.map +1 -1
- package/dist/components/Calculator/Calculator.mobile.js +2 -1
- package/dist/components/Calculator/Calculator.mobile.js.map +1 -1
- package/dist/components/Calculator/Rate.js +1 -1
- package/dist/components/Calculator/Rate.js.map +1 -1
- package/dist/components/Footer/Footer.js +3 -1
- package/dist/components/Footer/Footer.js.map +1 -1
- package/dist/components/Footer/Footer.mobile.js +3 -1
- package/dist/components/Footer/Footer.mobile.js.map +1 -1
- package/dist/components/Tabs/Tabs.d.ts +1 -1
- package/dist/components/Tabs/Tabs.js +22 -3
- package/dist/components/Tabs/Tabs.js.map +1 -1
- package/dist/hooks/useRouter.d.ts +1 -0
- package/dist/hooks/useRouter.js +1 -0
- package/dist/hooks/useRouter.js.map +1 -1
- package/dist/setup-fixture.js +2 -1
- package/dist/setup-fixture.js.map +1 -1
- package/dist/ui-kit/TabsControl/TabItem.d.ts +1 -0
- package/dist/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/dist/utils/deleteAllCookie.d.ts +1 -0
- package/dist/utils/deleteAllCookie.js +11 -0
- package/dist/utils/deleteAllCookie.js.map +1 -0
- package/lib/common.css +1 -1
- package/lib/components/ApplicationForm/ApplicationFormGrantSupport.js +1 -1
- package/lib/components/ApplicationForm/ApplicationFormGrantSupport.js.map +1 -1
- package/lib/components/Calculator/Calculator.mobile.js +2 -1
- package/lib/components/Calculator/Calculator.mobile.js.map +1 -1
- package/lib/components/Calculator/Rate.js +1 -1
- package/lib/components/Calculator/Rate.js.map +1 -1
- package/lib/components/Footer/Footer.js +3 -1
- package/lib/components/Footer/Footer.js.map +1 -1
- package/lib/components/Footer/Footer.mobile.js +3 -1
- package/lib/components/Footer/Footer.mobile.js.map +1 -1
- package/lib/components/Tabs/Tabs.d.ts +1 -1
- package/lib/components/Tabs/Tabs.js +22 -3
- package/lib/components/Tabs/Tabs.js.map +1 -1
- package/lib/hooks/useRouter.d.ts +1 -0
- package/lib/hooks/useRouter.js +1 -0
- package/lib/hooks/useRouter.js.map +1 -1
- package/lib/setup-fixture.js +2 -1
- package/lib/setup-fixture.js.map +1 -1
- package/lib/ui-kit/TabsControl/TabItem.d.ts +1 -0
- package/lib/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/lib/utils/deleteAllCookie.d.ts +1 -0
- package/lib/utils/deleteAllCookie.js +8 -0
- package/lib/utils/deleteAllCookie.js.map +1 -0
- package/mobile/bundle/bundle.umd.js +35 -8
- package/mobile/bundle/bundle.umd.min.js +1 -1
- package/mobile/bundle/components/Tabs/Tabs.d.ts +1 -1
- package/mobile/bundle/hooks/useRouter.d.ts +1 -0
- package/mobile/bundle/ui-kit/TabsControl/TabItem.d.ts +1 -0
- package/mobile/bundle/utils/deleteAllCookie.d.ts +1 -0
- package/mobile/dist/components/ApplicationForm/ApplicationFormGrantSupport.js +1 -1
- package/mobile/dist/components/ApplicationForm/ApplicationFormGrantSupport.js.map +1 -1
- package/mobile/dist/components/Calculator/Calculator.js +2 -1
- package/mobile/dist/components/Calculator/Calculator.js.map +1 -1
- package/mobile/dist/components/Calculator/Rate.js +1 -1
- package/mobile/dist/components/Calculator/Rate.js.map +1 -1
- package/mobile/dist/components/Footer/Footer.js +3 -1
- package/mobile/dist/components/Footer/Footer.js.map +1 -1
- package/mobile/dist/components/Tabs/Tabs.d.ts +1 -1
- package/mobile/dist/components/Tabs/Tabs.js +22 -3
- package/mobile/dist/components/Tabs/Tabs.js.map +1 -1
- package/mobile/dist/hooks/useRouter.d.ts +1 -0
- package/mobile/dist/hooks/useRouter.js +1 -0
- package/mobile/dist/hooks/useRouter.js.map +1 -1
- package/mobile/dist/setup-fixture.js +2 -1
- package/mobile/dist/setup-fixture.js.map +1 -1
- package/mobile/dist/ui-kit/TabsControl/TabItem.d.ts +1 -0
- package/mobile/dist/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/mobile/dist/utils/deleteAllCookie.d.ts +1 -0
- package/mobile/dist/utils/deleteAllCookie.js +11 -0
- package/mobile/dist/utils/deleteAllCookie.js.map +1 -0
- package/mobile/lib/common.css +1 -1
- package/mobile/lib/components/ApplicationForm/ApplicationFormGrantSupport.js +1 -1
- package/mobile/lib/components/ApplicationForm/ApplicationFormGrantSupport.js.map +1 -1
- package/mobile/lib/components/Calculator/Calculator.js +2 -1
- package/mobile/lib/components/Calculator/Calculator.js.map +1 -1
- package/mobile/lib/components/Calculator/Rate.js +1 -1
- package/mobile/lib/components/Calculator/Rate.js.map +1 -1
- package/mobile/lib/components/Footer/Footer.js +3 -1
- package/mobile/lib/components/Footer/Footer.js.map +1 -1
- package/mobile/lib/components/Tabs/Tabs.d.ts +1 -1
- package/mobile/lib/components/Tabs/Tabs.js +22 -3
- package/mobile/lib/components/Tabs/Tabs.js.map +1 -1
- package/mobile/lib/hooks/useRouter.d.ts +1 -0
- package/mobile/lib/hooks/useRouter.js +1 -0
- package/mobile/lib/hooks/useRouter.js.map +1 -1
- package/mobile/lib/setup-fixture.js +2 -1
- package/mobile/lib/setup-fixture.js.map +1 -1
- package/mobile/lib/ui-kit/TabsControl/TabItem.d.ts +1 -0
- package/mobile/lib/ui-kit/TabsControl/TabItem.js.map +1 -1
- package/mobile/lib/utils/deleteAllCookie.d.ts +1 -0
- package/mobile/lib/utils/deleteAllCookie.js +8 -0
- package/mobile/lib/utils/deleteAllCookie.js.map +1 -0
- package/mobile/src/components/ApplicationForm/ApplicationFormGrantSupport.tsx +1 -0
- package/mobile/src/components/Calculator/Calculator.tsx +9 -1
- package/mobile/src/components/Calculator/Rate.tsx +1 -3
- package/mobile/src/components/Footer/Footer.tsx +10 -0
- package/mobile/src/components/Tabs/Tabs.tsx +28 -4
- package/mobile/src/hooks/useRouter.ts +2 -0
- package/mobile/src/setup-fixture.ts +2 -1
- package/mobile/src/ui-kit/TabsControl/TabItem.tsx +1 -0
- package/mobile/src/utils/deleteAllCookie.ts +8 -0
- package/package.json +2 -2
- package/src/components/ApplicationForm/ApplicationFormGrantSupport.tsx +1 -0
- package/src/components/Calculator/Calculator.mobile.tsx +9 -1
- package/src/components/Calculator/Rate.tsx +1 -3
- package/src/components/Footer/Footer.mobile.tsx +10 -0
- package/src/components/Footer/Footer.tsx +10 -0
- package/src/components/Tabs/Tabs.tsx +28 -4
- package/src/hooks/useRouter.ts +2 -0
- package/src/setup-fixture.ts +2 -1
- package/src/ui-kit/TabsControl/TabItem.tsx +1 -0
- package/src/utils/deleteAllCookie.ts +8 -0
|
@@ -7,10 +7,12 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
|
|
|
7
7
|
import { Button } from '../../ui-kit/Button/Button.js';
|
|
8
8
|
import { Text } from '../../ui-kit/Text/Text.js';
|
|
9
9
|
import { appendSlash } from '../../utils/appendSlash.js';
|
|
10
|
+
import { deleteAllCookies } from '../../utils/deleteAllCookie.js';
|
|
10
11
|
import { RollupItem } from '../RollupItem/RollupItem.js';
|
|
11
12
|
import { Contacts } from './Contacts.js';
|
|
12
13
|
import { findIconByHref } from './findIconByHref.js';
|
|
13
14
|
import { HorizontalNavigation } from './HorizontalNavigation.js';
|
|
15
|
+
import { HorizontalNavigationLink } from './HorizontalNavigationLink.js';
|
|
14
16
|
import { LinkList } from './LinkList.js';
|
|
15
17
|
import { SocialMedia } from './SocialMedia.js';
|
|
16
18
|
import { TextInformation } from './TextInformation.js';
|
|
@@ -18,7 +20,7 @@ export const Footer = JSX(({ className, ...rest }) => {
|
|
|
18
20
|
const fallback = rest.options?.page?.fallback;
|
|
19
21
|
const { topItems } = useSitemap(fallback);
|
|
20
22
|
const { relatedEnterprises, contacts, socialMedia, mobileApps, horizontalNavigationTitle, documents, } = useSWRResource(projectSettings.FOOTER || 'footer', { fallback });
|
|
21
|
-
return (_jsxs(BlockWrapper, { tag: "footer", className: className, defaultPadding: "p-4xl pb-24", ...rest, children: [_jsx("div", { className: "mb-lg pb-xs border-b border-main-divider", children: topItems?.map((item, i) => (_jsx(RollupItem, { label: item?.text, labelIcon: item?.icon, children: _jsx(LinkList, { items: item.items, basePath: appendSlash(item.href) }) }, String(i)))) }), _jsx(Contacts, { className: "overflow-hidden", items: contacts }), _jsxs("div", { className: "mt-xl", children: [_jsx(SocialMedia, { className: "mb-xl", media: socialMedia, stretched: true, children: "\u0421\u043E\u0446\u0441\u0435\u0442\u0438" }), _jsx(Text, { size: "text-s", font: "font-light", color: "text-secondary-text", children: "\u041C\u043E\u0431\u0438\u043B\u044C\u043D\u043E\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435" }), _jsx("div", { className: "mt-xs", children: mobileApps?.map(renderButton) })] }), _jsx(HorizontalNavigation, { className: "py-lg border-y border-main-divider", title: horizontalNavigationTitle, links: relatedEnterprises }), _jsx(TextInformation, { links: documents })] }));
|
|
23
|
+
return (_jsxs(BlockWrapper, { tag: "footer", className: className, defaultPadding: "p-4xl pb-24", ...rest, children: [_jsx("div", { className: "mb-lg pb-xs border-b border-main-divider", children: topItems?.map((item, i) => (_jsx(RollupItem, { label: item?.text, labelIcon: item?.icon, children: _jsx(LinkList, { items: item.items, basePath: appendSlash(item.href) }) }, String(i)))) }), _jsx(Contacts, { className: "overflow-hidden", items: contacts }), _jsxs("div", { className: "mt-xl", children: [_jsx(SocialMedia, { className: "mb-xl", media: socialMedia, stretched: true, children: "\u0421\u043E\u0446\u0441\u0435\u0442\u0438" }), _jsx(Text, { size: "text-s", font: "font-light", color: "text-secondary-text", children: "\u041C\u043E\u0431\u0438\u043B\u044C\u043D\u043E\u0435 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0435" }), _jsx("div", { className: "mt-xs", children: mobileApps?.map(renderButton) })] }), _jsx("div", { className: "py-lg border-t border-main-divider", children: _jsx(HorizontalNavigationLink, { text: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u043D\u0430 \u043F\u0440\u0435\u0436\u043D\u044E\u044E \u0432\u0435\u0440\u0441\u0438\u044E \u0441\u0430\u0439\u0442\u0430", className: "text-l font-light max-w-[292px]", href: "https://old.rshb.ru", onClick: deleteAllCookies }) }), _jsx(HorizontalNavigation, { className: "py-lg border-y border-main-divider", title: horizontalNavigationTitle, links: relatedEnterprises }), _jsx(TextInformation, { links: documents })] }));
|
|
22
24
|
});
|
|
23
25
|
const renderButton = ({ href = '/', text }, i) => {
|
|
24
26
|
const { label } = findIconByHref(href);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Footer.js","sourceRoot":"","sources":["../../../src/components/Footer/Footer.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAE5D,OAAO,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAC;AACxD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,4BAA4B,CAAC;AACpD,OAAO,EAAE,IAAI,EAAE,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,yBAAyB,CAAC;AACtD,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAGlD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AACtC,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AAEpD,MAAM,CAAC,MAAM,MAAM,GAAG,GAAG,CAAc,CAAC,EAAE,SAAS,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAChE,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,QAAQ,CAAC;IAC9C,MAAM,EAAE,QAAQ,EAAE,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;IAC1C,MAAM,EACJ,kBAAkB,EAClB,QAAQ,EACR,WAAW,EACX,UAAU,EACV,yBAAyB,EACzB,SAAS,GACV,GAAG,cAAc,CAAkB,eAAe,CAAC,MAAM,IAAI,QAAQ,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;IAEtF,OAAO,CACL,MAAC,YAAY,IAAC,GAAG,EAAC,QAAQ,EAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAC,aAAa,KAAK,IAAI,aACpF,cAAK,SAAS,EAAC,0CAA0C,YACtD,QAAQ,EAAE,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,EAAE,EAAE,CAAC,CAC1B,KAAC,UAAU,IAAiB,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,IAAI,YAClE,KAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,IAAI,CAAC,IAAI,CAAC,GAAI,IADlD,MAAM,CAAC,CAAC,CAAC,CAEb,CACd,CAAC,GACE,EACN,KAAC,QAAQ,IAAC,SAAS,EAAC,iBAAiB,EAAC,KAAK,EAAE,QAAQ,GAAI,EACzD,eAAK,SAAS,EAAC,OAAO,aACpB,KAAC,WAAW,IAAC,SAAS,EAAC,OAAO,EAAC,KAAK,EAAE,WAAW,EAAE,SAAS,EAAE,IAAI,2DAEpD,EACd,KAAC,IAAI,IAAC,IAAI,EAAC,QAAQ,EAAC,IAAI,EAAC,YAAY,EAAC,KAAK,EAAC,qBAAqB,oIAE1D,EACP,cAAK,SAAS,EAAC,OAAO,YAAE,UAAU,EAAE,GAAG,CAAC,YAAY,CAAC,GAAO,IACxD,EACN,KAAC,oBAAoB,IACnB,SAAS,EAAC,oCAAoC,EAC9C,KAAK,EAAE,yBAAyB,EAChC,KAAK,EAAE,kBAAkB,GACzB,EACF,KAAC,eAAe,IAAC,KAAK,EAAE,SAAS,GAAI,IACxB,CAChB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,MAAM,YAAY,GAAG,CAAC,EAAE,IAAI,GAAG,GAAG,EAAE,IAAI,EAAa,EAAE,CAAS,EAAE,EAAE;IAClE,MAAM,EAAE,KAAK,EAAE,GAAG,cAAc,CAAC,IAAI,CAAC,CAAC;IAEvC,OAAO,CACL,KAAC,MAAM,IAEL,SAAS,EAAC,cAAc,EACxB,IAAI,EAAE,IAAI,IAAI,KAAK,EACnB,OAAO,EAAC,WAAW,EACnB,IAAI,EAAE,IAAI,EACV,MAAM,EAAC,QAAQ,IALV,MAAM,CAAC,CAAC,CAAC,CAMd,CACH,CAAC;AACJ,CAAC,CAAC"}
|
|
1
|
+
{"version":3,"file":"Footer.js","sourceRoot":"","sources":["../../../src/components/Footer/Footer.tsx"],"names":[],"mappings":"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"}
|
|
@@ -2,28 +2,47 @@ import { jsx as _jsx } from "@redneckz/uni-jsx/jsx-runtime";
|
|
|
2
2
|
import { JSX } from '@redneckz/uni-jsx';
|
|
3
3
|
import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
|
|
4
4
|
import { defaultEventBus } from '../../EventBus/defaultEventBus.js';
|
|
5
|
+
import { useRouter } from '../../hooks/useRouter.js';
|
|
5
6
|
import { BlockWrapper } from '../../ui-kit/BlockWrapper.js';
|
|
6
7
|
import { style } from '../../utils/style.js';
|
|
7
8
|
import { renderTabs } from './renderTabs.js';
|
|
9
|
+
const TAB_QUERY_PARAM_KEY = 'tab';
|
|
8
10
|
export const Tabs = JSX(({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
|
|
11
|
+
const router = useRouter();
|
|
12
|
+
const { isReady } = router;
|
|
9
13
|
const tabsControlItems = useMemo(() => tabs.map(normalizeTab), [tabs]);
|
|
10
14
|
const [activeTabIndex, setActiveTabIndex] = useState(0);
|
|
11
15
|
useEffect(() => {
|
|
12
16
|
if (!tabs || !tabs[0]) {
|
|
13
17
|
return;
|
|
14
18
|
}
|
|
15
|
-
|
|
16
|
-
|
|
19
|
+
const defaultTabIndex = router.query[TAB_QUERY_PARAM_KEY]
|
|
20
|
+
? tabs.findIndex((_) => _.type === 'group' && _.ref === router.query[TAB_QUERY_PARAM_KEY]) || 0
|
|
21
|
+
: 0;
|
|
22
|
+
setActiveTabIndex(defaultTabIndex);
|
|
23
|
+
fireTabEvent(tabs[defaultTabIndex]);
|
|
24
|
+
}, [isReady]);
|
|
17
25
|
useEffect(() => {
|
|
18
26
|
const activeTab = tabs[activeTabIndex];
|
|
19
27
|
if (activeTab?.type === 'group') {
|
|
20
28
|
defaultEventBus.subject('tab', { type: activeTab.type, label: activeTab.ref });
|
|
21
29
|
}
|
|
22
30
|
}, [tabs, activeTabIndex]);
|
|
31
|
+
const updateUrlSearchTabParam = (_) => {
|
|
32
|
+
const searchParams = new URLSearchParams(router.query);
|
|
33
|
+
if (_.name) {
|
|
34
|
+
searchParams.set(TAB_QUERY_PARAM_KEY, _.name);
|
|
35
|
+
}
|
|
36
|
+
else {
|
|
37
|
+
searchParams.delete(TAB_QUERY_PARAM_KEY);
|
|
38
|
+
}
|
|
39
|
+
router.replace(`${router.pathname}?${searchParams}`, '', { scroll: false });
|
|
40
|
+
};
|
|
23
41
|
const handleChange = useCallback((_) => {
|
|
24
42
|
const index = tabsControlItems.indexOf(_);
|
|
25
43
|
setActiveTabIndex(index);
|
|
26
44
|
fireTabEvent(tabs[index]);
|
|
45
|
+
updateUrlSearchTabParam(_);
|
|
27
46
|
}, [tabs, tabsControlItems]);
|
|
28
47
|
return (_jsx(BlockWrapper, { className: style(isSticky ? 'sticky top-1 z-20' : '', className), defaultPadding: "p-0", ...rest, children: renderTabs({
|
|
29
48
|
items: tabsControlItems,
|
|
@@ -40,5 +59,5 @@ const fireTabEvent = (tab) => {
|
|
|
40
59
|
defaultEventBus.fire('tab', { type: tab.type, label: tab.href });
|
|
41
60
|
}
|
|
42
61
|
};
|
|
43
|
-
const normalizeTab = (_) =>
|
|
62
|
+
const normalizeTab = (_) => _?.type === 'group' ? { text: _.title, name: _.ref } : _;
|
|
44
63
|
//# sourceMappingURL=Tabs.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Tabs.js","sourceRoot":"","sources":["../../../src/components/Tabs/Tabs.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAC;
|
|
1
|
+
{"version":3,"file":"Tabs.js","sourceRoot":"","sources":["../../../src/components/Tabs/Tabs.tsx"],"names":[],"mappings":"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"}
|
|
@@ -9,6 +9,7 @@ export interface Router {
|
|
|
9
9
|
push: (url: string, as?: string, options?: RouterOptions) => void;
|
|
10
10
|
replace: (url: string, as?: string, options?: RouterOptions) => void;
|
|
11
11
|
back: () => void;
|
|
12
|
+
isReady: boolean;
|
|
12
13
|
}
|
|
13
14
|
export declare function useRouter(): Router;
|
|
14
15
|
export declare namespace useRouter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useRouter.js","sourceRoot":"","sources":["../../src/hooks/useRouter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"useRouter.js","sourceRoot":"","sources":["../../src/hooks/useRouter.ts"],"names":[],"mappings":"AAeA,MAAM,UAAU,SAAS;IACvB,OAAO,SAAS,CAAC,KAAK,EAAE,CAAC;AAC3B,CAAC;AAED,SAAS,CAAC,KAAK,GAAG,GAAW,EAAE,CAAC,CAAC;IAC/B,OAAO,EAAE,KAAK;IACd,IAAI,EAAE,UAAU,CAAC,QAAQ,EAAE,IAAI,IAAI,GAAG;IACtC,QAAQ,EAAE,UAAU,CAAC,QAAQ,EAAE,QAAQ,IAAI,GAAG;IAC9C,KAAK,EAAE,EAAE;IACT,IAAI,EAAE,GAAG,EAAE;QACT,aAAa;IACf,CAAC;IACD,OAAO,EAAE,GAAG,EAAE;QACZ,aAAa;IACf,CAAC;IACD,IAAI,EAAE,GAAG,EAAE;QACT,aAAa;IACf,CAAC;CACF,CAAC,CAAC;AAEH,SAAS,CAAC,KAAK,GAAG,CAAC,IAAkB,EAAE,EAAE;IACvC,SAAS,CAAC,KAAK,GAAG,IAAI,CAAC;AACzB,CAAC,CAAC"}
|
|
@@ -19,8 +19,9 @@ useRouter.setup(() => {
|
|
|
19
19
|
}, []);
|
|
20
20
|
return {
|
|
21
21
|
href,
|
|
22
|
+
isReady: true,
|
|
22
23
|
pathname: new URL(href).pathname.substring(projectSettings.BASE_PATH ? projectSettings.BASE_PATH.length - 1 : 0),
|
|
23
|
-
query:
|
|
24
|
+
query: Object.fromEntries(new URLSearchParams(globalThis.location.search)),
|
|
24
25
|
push: (url) => {
|
|
25
26
|
globalThis.history.pushState(null, '', url);
|
|
26
27
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAC9B,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,SAAS,EAAE,EAAE,CAAC,CACpE,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CACxC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CACrE;QACD,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"setup-fixture.js","sourceRoot":"","sources":["../src/setup-fixture.ts"],"names":[],"mappings":"AAAA,OAAO,mCAAmC,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAC;AACvC,OAAO,GAAG,MAAM,YAAY,CAAC;AAE7B,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AAE3B,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;IACnB,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAC9B,QAAQ,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,EAAE,eAAe,CAAC,SAAS,EAAE,EAAE,CAAC,CACpE,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,mBAAmB,GAAG,GAAG,EAAE;YAC/B,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;QACpC,CAAC,CAAC;QAEF,UAAU,CAAC,gBAAgB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAE7D,OAAO,GAAG,EAAE;YACV,UAAU,CAAC,mBAAmB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAClE,CAAC,CAAC;IACJ,CAAC,EAAE,EAAE,CAAC,CAAC;IAEP,OAAO;QACL,IAAI;QACJ,OAAO,EAAE,IAAI;QACb,QAAQ,EAAE,IAAI,GAAG,CAAC,IAAI,CAAC,CAAC,QAAQ,CAAC,SAAS,CACxC,eAAe,CAAC,SAAS,CAAC,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CACrE;QACD,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,eAAe,CAAC,UAAU,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QAC1E,IAAI,EAAE,CAAC,GAAW,EAAE,EAAE;YACpB,UAAU,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,EAAE,CAAC,GAAW,EAAE,EAAE;YACvB,UAAU,CAAC,OAAO,CAAC,YAAY,CAAC,IAAI,EAAE,EAAE,EAAE,GAAG,CAAC,CAAC;QACjD,CAAC;QACD,IAAI,EAAE,GAAG,EAAE;YACT,UAAU,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QAC5B,CAAC;KACF,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,gBAAgB,CAAC,KAAK,CAAC,CAAC,OAAO,EAAO,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE;IAC9C,EAAE,CAAC,cAAc,EAAE,CAAC;IACpB,OAAO,CAAC,EAAE,CAAC,CAAC;AACd,CAAC,CAAC,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { type LinkProps } from '../../model/LinkProps';
|
|
|
2
2
|
import { type VNode } from '../../model/VNode';
|
|
3
3
|
import { type TabsControlProps } from './TabsControlProps';
|
|
4
4
|
export interface TabItemBase extends LinkProps {
|
|
5
|
+
name?: string;
|
|
5
6
|
appendRight?: VNode;
|
|
6
7
|
}
|
|
7
8
|
export declare type TabType = 'default' | 'underlined' | 'rounded';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TabItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TabsControl/TabItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;
|
|
1
|
+
{"version":3,"file":"TabItem.js","sourceRoot":"","sources":["../../../src/ui-kit/TabsControl/TabItem.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,mBAAmB,CAAC;AACxC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAC;AAC1D,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAG9C,OAAO,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAC;AAgB9C,MAAM,CAAC,MAAM,OAAO,GAAG,GAAG,CAAe,CAAC,KAAK,EAAE,EAAE,CACjD,KAAK,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC,KAAC,WAAW,OAAK,KAAK,GAAI,CAAC,CAAC,CAAC,KAAC,aAAa,OAAK,KAAK,GAAI,CAC9E,CAAC;AAEF,MAAM,WAAW,GAAG,GAAG,CAAe,CAAC,KAAK,EAAE,EAAE;IAC9C,MAAM,IAAI,GAAG,OAAO,EAAE,CAAC;IAEvB,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IACnD,CAAC,EAAE,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAEhC,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,GAAG,IAAI,CAAC,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC;IAE3E,OAAO,KAAC,YAAY,OAAK,KAAK,EAAE,GAAG,EAAC,GAAG,EAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,GAAI,CAAC;AAC3E,CAAC,CAAC,CAAC;AAEH,mDAAmD;AACnD,MAAM,aAAa,GAAG,GAAG,CAAe,CAAC,EAAE,IAAI,GAAG,EAAE,EAAE,OAAO,EAAE,GAAG,IAAI,EAAE,EAAE,EAAE;IAC1E,MAAM,WAAW,GAAG,WAAW,CAAC,GAAG,EAAE;QACnC,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC,EAAE,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;IAEpB,OAAO,KAAC,YAAY,IAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,KAAM,IAAI,GAAI,CAAC;AACtE,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export declare const deleteAllCookies: () => void;
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export const deleteAllCookies = () => {
|
|
2
|
+
const cookies = globalThis.document?.cookie.split(';') ?? [];
|
|
3
|
+
for (const cookie of cookies) {
|
|
4
|
+
const [name] = cookie.split('=');
|
|
5
|
+
globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
|
|
6
|
+
}
|
|
7
|
+
};
|
|
8
|
+
//# sourceMappingURL=deleteAllCookie.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"deleteAllCookie.js","sourceRoot":"","sources":["../../src/utils/deleteAllCookie.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,MAAM,OAAO,GAAG,UAAU,CAAC,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAE7D,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE;QAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACjC,UAAU,CAAC,QAAQ,CAAC,MAAM,GAAG,GAAG,IAAI,gDAAgD,CAAC;KACtF;AACH,CAAC,CAAC"}
|
|
@@ -30,6 +30,7 @@ export const ApplicationFormGrantSupport = JSX<ApplicationFormsProps>((props) =>
|
|
|
30
30
|
<SelectControl
|
|
31
31
|
label="Ваш регион"
|
|
32
32
|
placeholder="Выберите регион"
|
|
33
|
+
isSearch={true}
|
|
33
34
|
options={regions.map(({ name = '' }) => ({ key: name }))}
|
|
34
35
|
value={region}
|
|
35
36
|
onChange={setRegion}
|
|
@@ -4,6 +4,7 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
|
4
4
|
import { Foldable } from '../../ui-kit/Foldable/Foldable';
|
|
5
5
|
import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps';
|
|
6
6
|
import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
|
|
7
|
+
import { Heading } from '../../ui-kit/Heading/Heading';
|
|
7
8
|
import { Icon } from '../../ui-kit/Icon/Icon';
|
|
8
9
|
import { Text } from '../../ui-kit/Text/Text';
|
|
9
10
|
import { type CalculatorContent, type CalculatorTab } from './CalculatorContent';
|
|
@@ -26,7 +27,14 @@ const renderCalculator = (tab: CalculatorTab) => {
|
|
|
26
27
|
|
|
27
28
|
const EmbeddedBlock = EmbeddableCalcBlocks[type];
|
|
28
29
|
|
|
29
|
-
return
|
|
30
|
+
return (
|
|
31
|
+
<div>
|
|
32
|
+
{tab?.calculatorBlock?.title ? (
|
|
33
|
+
<Heading className="mb-lg" title={tab?.calculatorBlock?.title} />
|
|
34
|
+
) : null}
|
|
35
|
+
<EmbeddedBlock {...tab.calculatorBlock} isMobile />
|
|
36
|
+
</div>
|
|
37
|
+
);
|
|
30
38
|
};
|
|
31
39
|
|
|
32
40
|
const renderTabs = (tabs: CalculatorTab[]) => {
|
|
@@ -24,9 +24,7 @@ export const Rate = JSX<RateProps>(
|
|
|
24
24
|
{unit ? <span className="text-7xl">{unit}</span> : null}
|
|
25
25
|
</div>
|
|
26
26
|
{depositeName && isShowDepositeName ? (
|
|
27
|
-
<div className="absolute bottom-
|
|
28
|
-
{depositeName}
|
|
29
|
-
</div>
|
|
27
|
+
<div className="absolute bottom-2 w-full text-left whitespace-nowrap">{depositeName}</div>
|
|
30
28
|
) : null}
|
|
31
29
|
</div>
|
|
32
30
|
</div>
|
|
@@ -7,12 +7,14 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
|
7
7
|
import { Button } from '../../ui-kit/Button/Button';
|
|
8
8
|
import { Text } from '../../ui-kit/Text/Text';
|
|
9
9
|
import { appendSlash } from '../../utils/appendSlash';
|
|
10
|
+
import { deleteAllCookies } from '../../utils/deleteAllCookie';
|
|
10
11
|
import { RollupItem } from '../RollupItem/RollupItem';
|
|
11
12
|
import { Contacts } from './Contacts';
|
|
12
13
|
import { findIconByHref } from './findIconByHref';
|
|
13
14
|
import { type FooterDataProps } from './FooterDataProps';
|
|
14
15
|
import { type FooterProps } from './FooterProps';
|
|
15
16
|
import { HorizontalNavigation } from './HorizontalNavigation';
|
|
17
|
+
import { HorizontalNavigationLink } from './HorizontalNavigationLink';
|
|
16
18
|
import { LinkList } from './LinkList';
|
|
17
19
|
import { SocialMedia } from './SocialMedia';
|
|
18
20
|
import { TextInformation } from './TextInformation';
|
|
@@ -48,6 +50,14 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
|
|
|
48
50
|
</Text>
|
|
49
51
|
<div className="mt-xs">{mobileApps?.map(renderButton)}</div>
|
|
50
52
|
</div>
|
|
53
|
+
<div className="py-lg border-t border-main-divider">
|
|
54
|
+
<HorizontalNavigationLink
|
|
55
|
+
text="Вернуться на прежнюю версию сайта"
|
|
56
|
+
className="text-l font-light max-w-[292px]"
|
|
57
|
+
href="https://old.rshb.ru"
|
|
58
|
+
onClick={deleteAllCookies}
|
|
59
|
+
/>
|
|
60
|
+
</div>
|
|
51
61
|
<HorizontalNavigation
|
|
52
62
|
className="py-lg border-y border-main-divider"
|
|
53
63
|
title={horizontalNavigationTitle}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
2
|
import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
3
|
import { defaultEventBus } from '../../EventBus/defaultEventBus';
|
|
4
|
-
import {
|
|
4
|
+
import { useRouter } from '../../hooks/useRouter';
|
|
5
|
+
import type { UniBlockProps } from '../../model/JSXBlock';
|
|
5
6
|
import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
6
7
|
import { type TabItemBase } from '../../ui-kit/TabsControl/TabItem';
|
|
7
8
|
import { style } from '../../utils/style';
|
|
@@ -10,8 +11,12 @@ import { type TabData, type TabsContent } from './TabsContent';
|
|
|
10
11
|
|
|
11
12
|
export interface TabsBlockProps extends TabsContent, UniBlockProps {}
|
|
12
13
|
|
|
14
|
+
const TAB_QUERY_PARAM_KEY = 'tab';
|
|
15
|
+
|
|
13
16
|
export const Tabs = JSX<TabsBlockProps>(
|
|
14
17
|
({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
|
|
18
|
+
const router = useRouter();
|
|
19
|
+
const { isReady } = router;
|
|
15
20
|
const tabsControlItems: TabItemBase[] = useMemo(() => tabs.map(normalizeTab), [tabs]);
|
|
16
21
|
|
|
17
22
|
const [activeTabIndex, setActiveTabIndex] = useState(0);
|
|
@@ -21,8 +26,15 @@ export const Tabs = JSX<TabsBlockProps>(
|
|
|
21
26
|
return;
|
|
22
27
|
}
|
|
23
28
|
|
|
24
|
-
|
|
25
|
-
|
|
29
|
+
const defaultTabIndex = router.query[TAB_QUERY_PARAM_KEY]
|
|
30
|
+
? tabs.findIndex(
|
|
31
|
+
(_) => _.type === 'group' && _.ref === router.query[TAB_QUERY_PARAM_KEY],
|
|
32
|
+
) || 0
|
|
33
|
+
: 0;
|
|
34
|
+
|
|
35
|
+
setActiveTabIndex(defaultTabIndex);
|
|
36
|
+
fireTabEvent(tabs[defaultTabIndex]);
|
|
37
|
+
}, [isReady]);
|
|
26
38
|
|
|
27
39
|
useEffect(() => {
|
|
28
40
|
const activeTab = tabs[activeTabIndex];
|
|
@@ -32,12 +44,23 @@ export const Tabs = JSX<TabsBlockProps>(
|
|
|
32
44
|
}
|
|
33
45
|
}, [tabs, activeTabIndex]);
|
|
34
46
|
|
|
47
|
+
const updateUrlSearchTabParam = (_: TabItemBase) => {
|
|
48
|
+
const searchParams = new URLSearchParams(router.query as Record<string, string>);
|
|
49
|
+
if (_.name) {
|
|
50
|
+
searchParams.set(TAB_QUERY_PARAM_KEY, _.name);
|
|
51
|
+
} else {
|
|
52
|
+
searchParams.delete(TAB_QUERY_PARAM_KEY);
|
|
53
|
+
}
|
|
54
|
+
router.replace(`${router.pathname}?${searchParams}`, '', { scroll: false });
|
|
55
|
+
};
|
|
56
|
+
|
|
35
57
|
const handleChange = useCallback(
|
|
36
58
|
(_: TabItemBase) => {
|
|
37
59
|
const index = tabsControlItems.indexOf(_);
|
|
38
60
|
|
|
39
61
|
setActiveTabIndex(index);
|
|
40
62
|
fireTabEvent(tabs[index]);
|
|
63
|
+
updateUrlSearchTabParam(_);
|
|
41
64
|
},
|
|
42
65
|
[tabs, tabsControlItems],
|
|
43
66
|
);
|
|
@@ -68,4 +91,5 @@ const fireTabEvent = (tab: TabData) => {
|
|
|
68
91
|
}
|
|
69
92
|
};
|
|
70
93
|
|
|
71
|
-
const normalizeTab = (_: TabData): TabItemBase =>
|
|
94
|
+
const normalizeTab = (_: TabData): TabItemBase =>
|
|
95
|
+
_?.type === 'group' ? { text: _.title, name: _.ref } : _;
|
|
@@ -10,6 +10,7 @@ export interface Router {
|
|
|
10
10
|
push: (url: string, as?: string, options?: RouterOptions) => void;
|
|
11
11
|
replace: (url: string, as?: string, options?: RouterOptions) => void;
|
|
12
12
|
back: () => void;
|
|
13
|
+
isReady: boolean;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
export function useRouter(): Router {
|
|
@@ -17,6 +18,7 @@ export function useRouter(): Router {
|
|
|
17
18
|
}
|
|
18
19
|
|
|
19
20
|
useRouter._impl = (): Router => ({
|
|
21
|
+
isReady: false,
|
|
20
22
|
href: globalThis.location?.href || '/',
|
|
21
23
|
pathname: globalThis.location?.pathname || '/',
|
|
22
24
|
query: {},
|
|
@@ -27,10 +27,11 @@ useRouter.setup(() => {
|
|
|
27
27
|
|
|
28
28
|
return {
|
|
29
29
|
href,
|
|
30
|
+
isReady: true,
|
|
30
31
|
pathname: new URL(href).pathname.substring(
|
|
31
32
|
projectSettings.BASE_PATH ? projectSettings.BASE_PATH.length - 1 : 0,
|
|
32
33
|
),
|
|
33
|
-
query:
|
|
34
|
+
query: Object.fromEntries(new URLSearchParams(globalThis.location.search)),
|
|
34
35
|
push: (url: string) => {
|
|
35
36
|
globalThis.history.pushState(null, '', url);
|
|
36
37
|
},
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
export const deleteAllCookies = () => {
|
|
2
|
+
const cookies = globalThis.document?.cookie.split(';') ?? [];
|
|
3
|
+
|
|
4
|
+
for (const cookie of cookies) {
|
|
5
|
+
const [name] = cookie.split('=');
|
|
6
|
+
globalThis.document.cookie = `${name}=;expires=Thu, 01 Jan 1970 00:00:00 GMT;path=/`;
|
|
7
|
+
}
|
|
8
|
+
};
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@redneckz/wildless-cms-uni-blocks",
|
|
3
|
-
"version": "0.14.
|
|
3
|
+
"version": "0.14.25",
|
|
4
4
|
"private": false,
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"author": "ЦК",
|
|
@@ -195,7 +195,7 @@
|
|
|
195
195
|
"path": "lib/common.css"
|
|
196
196
|
},
|
|
197
197
|
{
|
|
198
|
-
"limit": "
|
|
198
|
+
"limit": "62 kB",
|
|
199
199
|
"path": "bundle/bundle.umd.min.js"
|
|
200
200
|
}
|
|
201
201
|
],
|
|
@@ -30,6 +30,7 @@ export const ApplicationFormGrantSupport = JSX<ApplicationFormsProps>((props) =>
|
|
|
30
30
|
<SelectControl
|
|
31
31
|
label="Ваш регион"
|
|
32
32
|
placeholder="Выберите регион"
|
|
33
|
+
isSearch={true}
|
|
33
34
|
options={regions.map(({ name = '' }) => ({ key: name }))}
|
|
34
35
|
value={region}
|
|
35
36
|
onChange={setRegion}
|
|
@@ -4,6 +4,7 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
|
4
4
|
import { Foldable } from '../../ui-kit/Foldable/Foldable';
|
|
5
5
|
import { type FoldablePartProps } from '../../ui-kit/Foldable/FoldablePartProps';
|
|
6
6
|
import { FoldableSection } from '../../ui-kit/Foldable/FoldableSection';
|
|
7
|
+
import { Heading } from '../../ui-kit/Heading/Heading';
|
|
7
8
|
import { Icon } from '../../ui-kit/Icon/Icon';
|
|
8
9
|
import { Text } from '../../ui-kit/Text/Text';
|
|
9
10
|
import { type CalculatorContent, type CalculatorTab } from './CalculatorContent';
|
|
@@ -26,7 +27,14 @@ const renderCalculator = (tab: CalculatorTab) => {
|
|
|
26
27
|
|
|
27
28
|
const EmbeddedBlock = EmbeddableCalcBlocks[type];
|
|
28
29
|
|
|
29
|
-
return
|
|
30
|
+
return (
|
|
31
|
+
<div>
|
|
32
|
+
{tab?.calculatorBlock?.title ? (
|
|
33
|
+
<Heading className="mb-lg" title={tab?.calculatorBlock?.title} />
|
|
34
|
+
) : null}
|
|
35
|
+
<EmbeddedBlock {...tab.calculatorBlock} isMobile />
|
|
36
|
+
</div>
|
|
37
|
+
);
|
|
30
38
|
};
|
|
31
39
|
|
|
32
40
|
const renderTabs = (tabs: CalculatorTab[]) => {
|
|
@@ -24,9 +24,7 @@ export const Rate = JSX<RateProps>(
|
|
|
24
24
|
{unit ? <span className="text-7xl">{unit}</span> : null}
|
|
25
25
|
</div>
|
|
26
26
|
{depositeName && isShowDepositeName ? (
|
|
27
|
-
<div className="absolute bottom-
|
|
28
|
-
{depositeName}
|
|
29
|
-
</div>
|
|
27
|
+
<div className="absolute bottom-2 w-full text-left whitespace-nowrap">{depositeName}</div>
|
|
30
28
|
) : null}
|
|
31
29
|
</div>
|
|
32
30
|
</div>
|
|
@@ -7,12 +7,14 @@ import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
|
7
7
|
import { Button } from '../../ui-kit/Button/Button';
|
|
8
8
|
import { Text } from '../../ui-kit/Text/Text';
|
|
9
9
|
import { appendSlash } from '../../utils/appendSlash';
|
|
10
|
+
import { deleteAllCookies } from '../../utils/deleteAllCookie';
|
|
10
11
|
import { RollupItem } from '../RollupItem/RollupItem';
|
|
11
12
|
import { Contacts } from './Contacts';
|
|
12
13
|
import { findIconByHref } from './findIconByHref';
|
|
13
14
|
import { type FooterDataProps } from './FooterDataProps';
|
|
14
15
|
import { type FooterProps } from './FooterProps';
|
|
15
16
|
import { HorizontalNavigation } from './HorizontalNavigation';
|
|
17
|
+
import { HorizontalNavigationLink } from './HorizontalNavigationLink';
|
|
16
18
|
import { LinkList } from './LinkList';
|
|
17
19
|
import { SocialMedia } from './SocialMedia';
|
|
18
20
|
import { TextInformation } from './TextInformation';
|
|
@@ -48,6 +50,14 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
|
|
|
48
50
|
</Text>
|
|
49
51
|
<div className="mt-xs">{mobileApps?.map(renderButton)}</div>
|
|
50
52
|
</div>
|
|
53
|
+
<div className="py-lg border-t border-main-divider">
|
|
54
|
+
<HorizontalNavigationLink
|
|
55
|
+
text="Вернуться на прежнюю версию сайта"
|
|
56
|
+
className="text-l font-light max-w-[292px]"
|
|
57
|
+
href="https://old.rshb.ru"
|
|
58
|
+
onClick={deleteAllCookies}
|
|
59
|
+
/>
|
|
60
|
+
</div>
|
|
51
61
|
<HorizontalNavigation
|
|
52
62
|
className="py-lg border-y border-main-divider"
|
|
53
63
|
title={horizontalNavigationTitle}
|
|
@@ -3,9 +3,11 @@ import { useSWRResource } from '../../hooks/useSWRResource';
|
|
|
3
3
|
import { projectSettings } from '../../ProjectSettings';
|
|
4
4
|
import { useSitemap } from '../../services/sitemap/useSitemap';
|
|
5
5
|
import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
6
|
+
import { Button } from '../../ui-kit/Button/Button';
|
|
6
7
|
import { Logo } from '../../ui-kit/Logo/Logo';
|
|
7
8
|
import { SearchBar } from '../../ui-kit/SearchBar/SearchBar';
|
|
8
9
|
import { Sitemap } from '../../ui-kit/Sitemap/Sitemap';
|
|
10
|
+
import { deleteAllCookies } from '../../utils/deleteAllCookie';
|
|
9
11
|
import { style } from '../../utils/style';
|
|
10
12
|
import { Contacts } from './Contacts';
|
|
11
13
|
import { type FooterDataProps } from './FooterDataProps';
|
|
@@ -36,6 +38,14 @@ export const Footer = JSX<FooterProps>(({ className, ...rest }) => {
|
|
|
36
38
|
<SocialMedia media={mobileApps} showButtonText={false}>
|
|
37
39
|
Мобильное приложение
|
|
38
40
|
</SocialMedia>
|
|
41
|
+
<Button
|
|
42
|
+
version="link"
|
|
43
|
+
href="https://old.rshb.ru"
|
|
44
|
+
className="!text-left text-s font-light"
|
|
45
|
+
onClick={deleteAllCookies}
|
|
46
|
+
>
|
|
47
|
+
Вернуться на прежнюю версию сайта
|
|
48
|
+
</Button>
|
|
39
49
|
</div>
|
|
40
50
|
<Sitemap className="flex-grow" topItems={topItems} />
|
|
41
51
|
</div>
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { JSX } from '@redneckz/uni-jsx';
|
|
2
2
|
import { useCallback, useEffect, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
|
|
3
3
|
import { defaultEventBus } from '../../EventBus/defaultEventBus';
|
|
4
|
-
import {
|
|
4
|
+
import { useRouter } from '../../hooks/useRouter';
|
|
5
|
+
import type { UniBlockProps } from '../../model/JSXBlock';
|
|
5
6
|
import { BlockWrapper } from '../../ui-kit/BlockWrapper';
|
|
6
7
|
import { type TabItemBase } from '../../ui-kit/TabsControl/TabItem';
|
|
7
8
|
import { style } from '../../utils/style';
|
|
@@ -10,8 +11,12 @@ import { type TabData, type TabsContent } from './TabsContent';
|
|
|
10
11
|
|
|
11
12
|
export interface TabsBlockProps extends TabsContent, UniBlockProps {}
|
|
12
13
|
|
|
14
|
+
const TAB_QUERY_PARAM_KEY = 'tab';
|
|
15
|
+
|
|
13
16
|
export const Tabs = JSX<TabsBlockProps>(
|
|
14
17
|
({ className = '', isSticky, tabs = [], tabsMode, ...rest }) => {
|
|
18
|
+
const router = useRouter();
|
|
19
|
+
const { isReady } = router;
|
|
15
20
|
const tabsControlItems: TabItemBase[] = useMemo(() => tabs.map(normalizeTab), [tabs]);
|
|
16
21
|
|
|
17
22
|
const [activeTabIndex, setActiveTabIndex] = useState(0);
|
|
@@ -21,8 +26,15 @@ export const Tabs = JSX<TabsBlockProps>(
|
|
|
21
26
|
return;
|
|
22
27
|
}
|
|
23
28
|
|
|
24
|
-
|
|
25
|
-
|
|
29
|
+
const defaultTabIndex = router.query[TAB_QUERY_PARAM_KEY]
|
|
30
|
+
? tabs.findIndex(
|
|
31
|
+
(_) => _.type === 'group' && _.ref === router.query[TAB_QUERY_PARAM_KEY],
|
|
32
|
+
) || 0
|
|
33
|
+
: 0;
|
|
34
|
+
|
|
35
|
+
setActiveTabIndex(defaultTabIndex);
|
|
36
|
+
fireTabEvent(tabs[defaultTabIndex]);
|
|
37
|
+
}, [isReady]);
|
|
26
38
|
|
|
27
39
|
useEffect(() => {
|
|
28
40
|
const activeTab = tabs[activeTabIndex];
|
|
@@ -32,12 +44,23 @@ export const Tabs = JSX<TabsBlockProps>(
|
|
|
32
44
|
}
|
|
33
45
|
}, [tabs, activeTabIndex]);
|
|
34
46
|
|
|
47
|
+
const updateUrlSearchTabParam = (_: TabItemBase) => {
|
|
48
|
+
const searchParams = new URLSearchParams(router.query as Record<string, string>);
|
|
49
|
+
if (_.name) {
|
|
50
|
+
searchParams.set(TAB_QUERY_PARAM_KEY, _.name);
|
|
51
|
+
} else {
|
|
52
|
+
searchParams.delete(TAB_QUERY_PARAM_KEY);
|
|
53
|
+
}
|
|
54
|
+
router.replace(`${router.pathname}?${searchParams}`, '', { scroll: false });
|
|
55
|
+
};
|
|
56
|
+
|
|
35
57
|
const handleChange = useCallback(
|
|
36
58
|
(_: TabItemBase) => {
|
|
37
59
|
const index = tabsControlItems.indexOf(_);
|
|
38
60
|
|
|
39
61
|
setActiveTabIndex(index);
|
|
40
62
|
fireTabEvent(tabs[index]);
|
|
63
|
+
updateUrlSearchTabParam(_);
|
|
41
64
|
},
|
|
42
65
|
[tabs, tabsControlItems],
|
|
43
66
|
);
|
|
@@ -68,4 +91,5 @@ const fireTabEvent = (tab: TabData) => {
|
|
|
68
91
|
}
|
|
69
92
|
};
|
|
70
93
|
|
|
71
|
-
const normalizeTab = (_: TabData): TabItemBase =>
|
|
94
|
+
const normalizeTab = (_: TabData): TabItemBase =>
|
|
95
|
+
_?.type === 'group' ? { text: _.title, name: _.ref } : _;
|
package/src/hooks/useRouter.ts
CHANGED
|
@@ -10,6 +10,7 @@ export interface Router {
|
|
|
10
10
|
push: (url: string, as?: string, options?: RouterOptions) => void;
|
|
11
11
|
replace: (url: string, as?: string, options?: RouterOptions) => void;
|
|
12
12
|
back: () => void;
|
|
13
|
+
isReady: boolean;
|
|
13
14
|
}
|
|
14
15
|
|
|
15
16
|
export function useRouter(): Router {
|
|
@@ -17,6 +18,7 @@ export function useRouter(): Router {
|
|
|
17
18
|
}
|
|
18
19
|
|
|
19
20
|
useRouter._impl = (): Router => ({
|
|
21
|
+
isReady: false,
|
|
20
22
|
href: globalThis.location?.href || '/',
|
|
21
23
|
pathname: globalThis.location?.pathname || '/',
|
|
22
24
|
query: {},
|
package/src/setup-fixture.ts
CHANGED
|
@@ -27,10 +27,11 @@ useRouter.setup(() => {
|
|
|
27
27
|
|
|
28
28
|
return {
|
|
29
29
|
href,
|
|
30
|
+
isReady: true,
|
|
30
31
|
pathname: new URL(href).pathname.substring(
|
|
31
32
|
projectSettings.BASE_PATH ? projectSettings.BASE_PATH.length - 1 : 0,
|
|
32
33
|
),
|
|
33
|
-
query:
|
|
34
|
+
query: Object.fromEntries(new URLSearchParams(globalThis.location.search)),
|
|
34
35
|
push: (url: string) => {
|
|
35
36
|
globalThis.history.pushState(null, '', url);
|
|
36
37
|
},
|