npm - @redneckz/wildless-cms-uni-blocks - Versions diffs - 0.14.595 → 0.14.596 - Mend

@redneckz/wildless-cms-uni-blocks 0.14.595 → 0.14.596

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.

Files changed (335) hide show

package/src/ui-kit/LocationDialog/LocationDialog.tsx CHANGED Viewed

@@ -1,20 +1,18 @@
 import { JSX } from '@redneckz/uni-jsx';
-import { useCallback, useState } from '@redneckz/uni-jsx/lib/hooks';
+import { useCallback, useMemo, useState } from '@redneckz/uni-jsx/lib/hooks';
 import { type BranchesHeader, type ForeignOfficeProps } from '../../data/HeaderData';
-import { useLink } from '../../hooks/useLink';
 import { useLocation } from '../../hooks/useLocation';
 import { useRegions, type Region } from '../../hooks/useRegions';
 import { groupBy } from '../../utils/groupBy';
 import { jaroWinklerDistance } from '../../utils/jaroWinklerDistance';
 import { Dialog } from '../DialogManager/Dialog';
 import { useDialogManager } from '../DialogManager/useDialogManager';
-import { LinkWrapper } from '../LinkWrapper/LinkWrapper';
-import { Paragraph } from '../Paragraph/Paragraph';
 import { Text } from '../Text/Text';
 import { renderForeignOffices } from './renderForeignOffices';
 import { renderRegion } from './renderRegion';
 import { renderRegionGroup } from './renderRegionGroup';
 import { SearchBar } from './SearchBar';
+import { SelectedLocation } from './SelectedLocation';
 const SEARCH_TERM_MIN_LENGTH = 3;
@@ -24,22 +22,21 @@ export interface LocationDialogProps {
 }
 export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branches }) => {
-  const [currentLocation, selectCurrentLocation] = useLocation(branches?.default);
-  const link = useLink();
-  const { href } = link({ href: `/branches/${currentLocation.slug}` });
+  const selectLocation = useLocation(branches?.default);
   const [query, setQuery] = useState('');
-  const regions: Region[] = cleanUpRegions(useRegions()).sort((a, b) =>
-    a.name.localeCompare(b.name),
+  const rawRegions = useRegions();
+  const regions = useMemo(
+    () => cleanUpRegions(rawRegions).sort((a, b) => (a.name ?? '').localeCompare(b.name ?? '')),
+    [rawRegions],
   );
-  const regionsGroupByLetter: Map<string, Region[]> = groupBy(regions, regionFirstLetter);
+  const regionsGroupByLetter = useMemo(() => groupBy(regions, regionFirstLetter), [regions]);
   const { close } = useDialogManager();
   const handleChangeLocation = useCallback((region: Region) => {
-    selectCurrentLocation(region);
+    selectLocation(region);
     close();
   }, []);
@@ -51,16 +48,7 @@ export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branch
           <Text size="text-h4" color="text-primary-text">
             Выберите филиал
           </Text>
-          {currentLocation ? (
-            <div className="mb-s">
-              <Paragraph size="text-l" color="text-primary-text">
-                Сейчас выбран:
-                <LinkWrapper href={href} className="inline mx-2xs text-primary-main">
-                  {currentLocation.name}
-                </LinkWrapper>
-              </Paragraph>
-            </div>
-          ) : null}
+          <SelectedLocation defaultLocation={branches?.default} />
           <SearchBar onSearch={setQuery} searchTerm={query} />
         </div>
       }
@@ -86,10 +74,10 @@ export const LocationDialog = JSX<LocationDialogProps>(({ foreignOffices, branch
   );
 });
-const regionFirstLetter = (region: Region) => region.name?.charAt(0) || '';
+const regionFirstLetter = (region: Region) => region.name?.charAt(0) ?? '';
-const cleanUpRegions = (regions: Region[]) =>
+const cleanUpRegions = (regions: Region[]): Region[] =>
   regions.map((region) => ({
     ...region,
-    name: region.name?.replace(/республика|область|край'/gi, '').trim() || '',
+    name: region.name?.replace(/республика|область|край'/gi, '').trim() ?? '',
   }));

package/src/ui-kit/LocationDialog/SelectedLocation.tsx ADDED Viewed

@@ -0,0 +1,27 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { useLink } from '../../hooks/useLink';
+import { useLocationState } from '../../hooks/useLocation';
+import { LinkWrapper } from '../LinkWrapper/LinkWrapper';
+import { Paragraph } from '../Paragraph/Paragraph';
+interface SelectedLocationProps {
+  defaultLocation?: string;
+}
+export const SelectedLocation = JSX<SelectedLocationProps>(({ defaultLocation }) => {
+  const currentLocation = useLocationState(defaultLocation);
+  const link = useLink();
+  const { href } = link({ href: `/branches/${currentLocation.slug}` });
+  return currentLocation ? (
+    <div className="mb-s">
+      <Paragraph size="text-l" color="text-primary-text">
+        Сейчас выбран:
+        <LinkWrapper href={href} className="inline mx-2xs text-primary-main">
+          {currentLocation.name}
+        </LinkWrapper>
+      </Paragraph>
+    </div>
+  ) : null;
+});

package/src/ui-kit/PopupManager/PopupManager.tsx CHANGED Viewed

@@ -15,7 +15,7 @@ export const PopupManager = JSX(() => {
   useEffect(
     () =>
-      defaultEventBus.subscribe('popup', (action) => {
+      defaultEventBus.observable.subscribe('popup', (action) => {
         switch (action.type) {
           case 'open':
           case 'update':

package/src/ui-kit/PopupManager/usePopupManager.tsx CHANGED Viewed

@@ -4,8 +4,8 @@ import { type PopupOptions } from './PopupAction';
 export const usePopupManager = () => ({
   open: (popup: VNode, options: PopupOptions) =>
-    defaultEventBus.fire('popup', { type: 'open', popup, ...options }),
+    defaultEventBus.emitter.fire('popup', { type: 'open', popup, ...options }),
   update: (popup: VNode, options: PopupOptions) =>
-    defaultEventBus.fire('popup', { type: 'update', popup, ...options }),
-  close: () => defaultEventBus.fire('popup', { type: 'close' }),
+    defaultEventBus.emitter.fire('popup', { type: 'update', popup, ...options }),
+  close: () => defaultEventBus.emitter.fire('popup', { type: 'close' }),
 });

package/bundle/EventBus/useLatestEvent.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- import { type EventBus } from './EventBus';
2	- export declare const useLatestEvent: <EM extends Record<string, any>, K extends keyof EM>(eventBus: EventBus<EM>, type: K, initialEvent?: EM[K] \| undefined) => [EM[K] \| null, (_: EM[K]) => void];

package/bundle/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};

package/dist/EventBus/useLatestEvent.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- import { type EventBus } from './EventBus';
2	- export declare const useLatestEvent: <EM extends Record<string, any>, K extends keyof EM>(eventBus: EventBus<EM>, type: K, initialEvent?: EM[K] \| undefined) => [EM[K] \| null, (_: EM[K]) => void];

package/dist/EventBus/useLatestEvent.js DELETED Viewed

@@ -1,11 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useLatestEvent = void 0;
-const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
-const useLatestEvent = (eventBus, type, initialEvent) => {
-    const [latestEvent, setLatestEvent] = (0, hooks_1.useState)(initialEvent || null);
-    (0, hooks_1.useEffect)(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-    const fireEvent = (0, hooks_1.useCallback)((_) => eventBus.fire(type, _), [eventBus, type]);
-    return [latestEvent, fireEvent];
-};
-exports.useLatestEvent = useLatestEvent;
-//# sourceMappingURL=useLatestEvent.js.map

package/dist/EventBus/useLatestEvent.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"useLatestEvent.js","sourceRoot":"","sources":["../../src/EventBus/useLatestEvent.ts"],"names":[],"mappings":";;AAAA,uDAA+E;AAGxE,MAAM,cAAc,GAAG,CAC5B,QAAsB,EACtB,IAAO,EACP,YAAoB,EACgB,EAAE;IACtC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,IAAA,gBAAQ,EAAe,YAAY,IAAI,IAAI,CAAC,CAAC;IAEnF,IAAA,iBAAS,EAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtF,MAAM,SAAS,GAAG,IAAA,mBAAW,EAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtF,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AAClC,CAAC,CAAC;AAZW,QAAA,cAAc,kBAYzB"}

package/dist/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};

package/dist/components/CarouselTariffsCard/CarouselTariffsCardAction.js DELETED Viewed

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

package/dist/components/CarouselTariffsCard/CarouselTariffsCardAction.js.map DELETED Viewed

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

package/lib/EventBus/useLatestEvent.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- import { type EventBus } from './EventBus';
2	- export declare const useLatestEvent: <EM extends Record<string, any>, K extends keyof EM>(eventBus: EventBus<EM>, type: K, initialEvent?: EM[K] \| undefined) => [EM[K] \| null, (_: EM[K]) => void];

package/lib/EventBus/useLatestEvent.js DELETED Viewed

@@ -1,8 +0,0 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-export const useLatestEvent = (eventBus, type, initialEvent) => {
-    const [latestEvent, setLatestEvent] = useState(initialEvent || null);
-    useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-    const fireEvent = useCallback((_) => eventBus.fire(type, _), [eventBus, type]);
-    return [latestEvent, fireEvent];
-};
-//# sourceMappingURL=useLatestEvent.js.map

package/lib/EventBus/useLatestEvent.js.map DELETED Viewed

@@ -1 +0,0 @@

- {"version":3,"file":"useLatestEvent.js","sourceRoot":"","sources":["../../src/EventBus/useLatestEvent.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAG/E,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,QAAsB,EACtB,IAAO,EACP,YAAoB,EACgB,EAAE;IACtC,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,CAAe,YAAY,IAAI,IAAI,CAAC,CAAC;IAEnF,SAAS,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtF,MAAM,SAAS,GAAG,WAAW,CAAC,CAAC,CAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC;IAEtF,OAAO,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;AAClC,CAAC,CAAC"}

package/lib/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};

package/lib/components/CarouselTariffsCard/CarouselTariffsCardAction.js DELETED Viewed

	@@ -1,2 +0,0 @@
1	- export {};
2	- //# sourceMappingURL=CarouselTariffsCardAction.js.map

package/lib/components/CarouselTariffsCard/CarouselTariffsCardAction.js.map DELETED Viewed

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

package/mobile/bundle/EventBus/useLatestEvent.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- import { type EventBus } from './EventBus';
2	- export declare const useLatestEvent: <EM extends Record<string, any>, K extends keyof EM>(eventBus: EventBus<EM>, type: K, initialEvent?: EM[K] \| undefined) => [EM[K] \| null, (_: EM[K]) => void];

package/mobile/bundle/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};

package/mobile/dist/EventBus/useLatestEvent.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- import { type EventBus } from './EventBus';
2	- export declare const useLatestEvent: <EM extends Record<string, any>, K extends keyof EM>(eventBus: EventBus<EM>, type: K, initialEvent?: EM[K] \| undefined) => [EM[K] \| null, (_: EM[K]) => void];

package/mobile/dist/EventBus/useLatestEvent.js DELETED Viewed

@@ -1,11 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useLatestEvent = void 0;
-const hooks_1 = require("@redneckz/uni-jsx/lib/hooks");
-const useLatestEvent = (eventBus, type, initialEvent) => {
-    const [latestEvent, setLatestEvent] = (0, hooks_1.useState)(initialEvent || null);
-    (0, hooks_1.useEffect)(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-    const fireEvent = (0, hooks_1.useCallback)((_) => eventBus.fire(type, _), [eventBus, type]);
-    return [latestEvent, fireEvent];
-};
-exports.useLatestEvent = useLatestEvent;
-//# sourceMappingURL=useLatestEvent.js.map

package/mobile/dist/EventBus/useLatestEvent.js.map DELETED Viewed

@@ -1 +0,0 @@

package/mobile/dist/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};

package/mobile/dist/components/CarouselTariffsCard/CarouselTariffsCardAction.js DELETED Viewed

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

package/mobile/dist/components/CarouselTariffsCard/CarouselTariffsCardAction.js.map DELETED Viewed

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

package/mobile/lib/EventBus/useLatestEvent.d.ts DELETED Viewed

	@@ -1,2 +0,0 @@
1	- import { type EventBus } from './EventBus';
2	- export declare const useLatestEvent: <EM extends Record<string, any>, K extends keyof EM>(eventBus: EventBus<EM>, type: K, initialEvent?: EM[K] \| undefined) => [EM[K] \| null, (_: EM[K]) => void];

package/mobile/lib/EventBus/useLatestEvent.js DELETED Viewed

@@ -1,8 +0,0 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-export const useLatestEvent = (eventBus, type, initialEvent) => {
-    const [latestEvent, setLatestEvent] = useState(initialEvent || null);
-    useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-    const fireEvent = useCallback((_) => eventBus.fire(type, _), [eventBus, type]);
-    return [latestEvent, fireEvent];
-};
-//# sourceMappingURL=useLatestEvent.js.map

package/mobile/lib/EventBus/useLatestEvent.js.map DELETED Viewed

@@ -1 +0,0 @@

package/mobile/lib/components/CarouselTariffsCard/CarouselTariffsCardAction.d.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export declare type CarouselTariffsCardAction = {
-    type: 'fold';
-    isUnfolded: boolean;
-    parent: Slot;
-};

package/mobile/lib/components/CarouselTariffsCard/CarouselTariffsCardAction.js DELETED Viewed

	@@ -1,2 +0,0 @@
1	- export {};
2	- //# sourceMappingURL=CarouselTariffsCardAction.js.map

package/mobile/lib/components/CarouselTariffsCard/CarouselTariffsCardAction.js.map DELETED Viewed

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

package/mobile/src/EventBus/useLatestEvent.ts DELETED Viewed

@@ -1,16 +0,0 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { type EventBus } from './EventBus';
-export const useLatestEvent = <EM extends Record<string, any>, K extends keyof EM>(
-  eventBus: EventBus<EM>,
-  type: K,
-  initialEvent?: EM[K],
-): [EM[K] | null, (_: EM[K]) => void] => {
-  const [latestEvent, setLatestEvent] = useState<EM[K] | null>(initialEvent || null);
-  useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-  const fireEvent = useCallback((_: EM[K]) => eventBus.fire(type, _), [eventBus, type]);
-  return [latestEvent, fireEvent];
-};

package/mobile/src/components/CarouselTariffsCard/CarouselTariffsCardAction.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export type CarouselTariffsCardAction = {
-  type: 'fold';
-  isUnfolded: boolean;
-  parent: Slot;
-};

package/src/EventBus/useLatestEvent.ts DELETED Viewed

@@ -1,16 +0,0 @@
-import { useCallback, useEffect, useState } from '@redneckz/uni-jsx/lib/hooks';
-import { type EventBus } from './EventBus';
-export const useLatestEvent = <EM extends Record<string, any>, K extends keyof EM>(
-  eventBus: EventBus<EM>,
-  type: K,
-  initialEvent?: EM[K],
-): [EM[K] | null, (_: EM[K]) => void] => {
-  const [latestEvent, setLatestEvent] = useState<EM[K] | null>(initialEvent || null);
-  useEffect(() => eventBus.subscribe(type, (_) => setLatestEvent(_)), [eventBus, type]);
-  const fireEvent = useCallback((_: EM[K]) => eventBus.fire(type, _), [eventBus, type]);
-  return [latestEvent, fireEvent];
-};

package/src/components/CarouselTariffsCard/CarouselTariffsCardAction.ts DELETED Viewed

@@ -1,6 +0,0 @@
-import { type Slot } from './../../model/ContentPageDef';
-export type CarouselTariffsCardAction = {
-  type: 'fold';
-  isUnfolded: boolean;
-  parent: Slot;
-};