@redneckz/wildless-cms-uni-blocks 0.2.57 → 0.2.60

package/src/api/DaDataAPI.ts

@@ -1,4 +1,4 @@
-import { getCurrentPosition } from '../utils/getCurrentPosition';
+import { getGeolocation } from '../utils/getGeolocation';
 
 import type { DaDataResult } from '../types';
 
@@ -9,7 +9,7 @@ export function DaDataAPI(baseURL = '') {
     }
 
     try {
-      const coords = await getCurrentPosition();
+      const coords = await getGeolocation();
       const response = await fetch(`${baseURL}/geolocate`, {
         method: 'POST',
         mode: 'cors',

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

@@ -1,7 +1,7 @@
 import glob from 'glob';
 import util from 'util';
+import { toMobilePage } from '../toMobilePage';
 import type { ContentPageDef } from '../types';
-import { toMobilePage } from './toMobilePage';
 import type { TransformationOptions } from './TransformationOptions';
 import { transformContentPage } from './transformContentPage';
 

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

@@ -1,2 +1 @@
 export { ContentPageRepository } from './ContentPageRepository';
-export { toMobilePage } from './toMobilePage';

package/src/index.ts

@@ -16,13 +16,16 @@ export type {
 export type {
   ContentPageContext,
   Router,
+  AsyncDataHook,
+  GeolocationHook,
   LikeService,
-  Search,
   HandlerDecorator,
+  Search,
 } from './ContentPageContext';
 
 export { ContentPageHead } from './ContentPageHead';
 export { ContentPage } from './ContentPage';
+export { toMobilePage } from './toMobilePage';
 
 export { Blocks } from './Blocks';
 export type { BlockContent } from './Blocks';

package/src/{content-page-repository/toMobilePage.ts → toMobilePage.ts}

@@ -1,4 +1,4 @@
-import type { BlockDef, ContentPageDef } from '../types';
+import type { BlockDef, ContentPageDef } from './types';
 
 export function toMobilePage(contentPage: ContentPageDef): ContentPageDef {
   const blocks = contentPage.blocks?.filter(({ mobile }) => !mobile?.hidden).map(toMobileBlock);

package/src/types.ts

@@ -15,6 +15,8 @@ import type { ContentPageContext } from './ContentPageContext';
 export type ColorPalette = 'pc' | 'bc' | 'eo';
 
 export type BlockVersion = 'primary' | 'secondary';
+export type ButtonVersion = 'primary' | 'secondary';
+export type TitleSize = 'S' | 'M' | 'L' | 'XL';
 
 export interface BlockDef {
   type: string;

package/src/ui-kit/Button.fixture.tsx

@@ -1,6 +1,7 @@
 import '../setup-fixture';
 
 import { Button } from './Button';
+import { IconButton } from './IconButton';
 
 export default {
   all: (
@@ -60,6 +61,27 @@ export default {
           />
         </div>
       </div>
+      <div>
+        <p>With Icon</p>
+        <div className="flex gap-6" data-theme="pc">
+          <IconButton
+            href="https://www.rshb.ru/"
+            target="_blank"
+            aboveText="Доступно в"
+            text="Google Play"
+            version="secondary"
+            icon="PlayMarket"
+          />
+          <IconButton
+            href="https://www.rshb.ru/"
+            target="_blank"
+            aboveText="Загрузите в"
+            text="App Store"
+            version="secondary"
+            icon="AppleIcon"
+          />
+        </div>
+      </div>
     </div>
   ),
   'primary (Private clients)': (

package/src/ui-kit/Button.tsx

@@ -1,7 +1,6 @@
 import { JSX } from '@redneckz/uni-jsx';
-import type { LinkContent } from '../types';
+import type { ButtonVersion, LinkContent } from '../types';
 
-type ButtonVersion = 'primary' | 'secondary';
 export interface ButtonProps extends LinkContent {
   className?: string;
   onClick?: (ev: MouseEvent) => any;
@@ -21,7 +20,7 @@ const buttonDisabledStyleMap: Record<ButtonVersion, string> = {
   secondary: 'bg-secondary-light text-secondary-text',
 };
 
-const styleButton = 'inline-block rounded-md px-9 py-3.5 text-center font-sans';
+const styleButton = 'inline-block rounded-md px-8 py-2 text-center font-sans';
 
 export const Button = JSX<ButtonProps>(
   ({
@@ -46,7 +45,11 @@ export const Button = JSX<ButtonProps>(
             className || ''
           }`}
         >
-          <span className="text-sm font-medium">{text || children}</span>
+          {children ? (
+            <div>{children}</div>
+          ) : (
+            <div className="text-sm font-medium py-1.5">{text}</div>
+          )}
         </div>
       );
     }
@@ -59,7 +62,11 @@ export const Button = JSX<ButtonProps>(
         onClick={onClick}
         aria-label={ariaLabel}
       >
-        <span className="text-sm font-medium">{text || children}</span>
+        {children ? (
+          <div>{children}</div>
+        ) : (
+          <div className="text-sm font-medium py-1.5">{text}</div>
+        )}
       </a>
     );
   },

package/src/ui-kit/IconButton.tsx

@@ -0,0 +1,27 @@
+import { JSX } from '@redneckz/uni-jsx';
+import { AppleIcon, PlayMarket } from '../Icons/index';
+import type { ButtonProps } from './Button';
+import { Button } from './Button';
+
+const ICONS = { AppleIcon, PlayMarket };
+
+export interface IconButtonProps extends ButtonProps {
+  icon?: string;
+  aboveText?: string;
+}
+
+export const IconButton = JSX<IconButtonProps>((props) => {
+  return (
+    <Button {...props}>
+      {props.icon ? (
+        <div className="flex items-center">
+          <div className="mr-2">{ICONS[props.icon as keyof typeof ICONS]?.()}</div>
+          <div>
+            <div className="text-xxs text-left">{props.aboveText}</div>
+            <div className="text-sm font-medium text-left">{props.text}</div>
+          </div>
+        </div>
+      ) : null}
+    </Button>
+  );
+});

package/src/utils/getColSpan.ts

@@ -0,0 +1,5 @@
+export const getColSpan = (className: string) => {
+  const colSpanPrefix = 'col-span-';
+  const colSpanStr = className.split(/\s+/).find((_) => _.startsWith(colSpanPrefix));
+  return colSpanStr ? parseInt(colSpanStr.substring(colSpanPrefix.length), 10) : 12;
+};

package/src/utils/{getCurrentPosition.ts → getGeolocation.ts}

@@ -1,4 +1,4 @@
-export const getCurrentPosition = async () =>
+export const getGeolocation = async () =>
   new Promise<GeolocationCoordinates>((resolve) =>
     navigator.geolocation.getCurrentPosition(({ coords }) => resolve(coords)),
   );

package/dist/content-page-repository/toMobilePage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"toMobilePage.js","sourceRoot":"","sources":["../../src/content-page-repository/toMobilePage.ts"],"names":[],"mappings":";;AAEA,SAAgB,YAAY,CAAC,WAA2B;IACtD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC9F,OAAO;QACL,GAAG,WAAW;QACd,MAAM;KACP,CAAC;AACJ,CAAC;AAND,oCAMC;AAED,SAAS,aAAa,CAAC,KAAe;IACpC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,IAAI,MAAM,EAAE;QACV,OAAO;YACL,GAAG,KAAK;YACR,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;SACzD,CAAC;KACH;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}

package/dist/utils/getCurrentPosition.d.ts

@@ -1 +0,0 @@
-export declare const getCurrentPosition: () => Promise<GeolocationCoordinates>;

package/dist/utils/getCurrentPosition.js

@@ -1,5 +0,0 @@
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getCurrentPosition = void 0;
-const getCurrentPosition = async () => new Promise((resolve) => navigator.geolocation.getCurrentPosition(({ coords }) => resolve(coords)));
-exports.getCurrentPosition = getCurrentPosition;
-//# sourceMappingURL=getCurrentPosition.js.map

package/dist/utils/getCurrentPosition.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCurrentPosition.js","sourceRoot":"","sources":["../../src/utils/getCurrentPosition.ts"],"names":[],"mappings":";;AAAO,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE,CAC3C,IAAI,OAAO,CAAyB,CAAC,OAAO,EAAE,EAAE,CAC9C,SAAS,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC1E,CAAC;AAHS,QAAA,kBAAkB,sBAG3B"}

package/lib/content-page-repository/toMobilePage.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"toMobilePage.js","sourceRoot":"","sources":["../../src/content-page-repository/toMobilePage.ts"],"names":[],"mappings":"AAEA,MAAM,UAAU,YAAY,CAAC,WAA2B;IACtD,MAAM,MAAM,GAAG,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;IAC9F,OAAO;QACL,GAAG,WAAW;QACd,MAAM;KACP,CAAC;AACJ,CAAC;AAED,SAAS,aAAa,CAAC,KAAe;IACpC,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC;IACzB,IAAI,MAAM,EAAE;QACV,OAAO;YACL,GAAG,KAAK;YACR,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK;SACzD,CAAC;KACH;SAAM;QACL,OAAO,KAAK,CAAC;KACd;AACH,CAAC"}

package/lib/utils/getCurrentPosition.d.ts

@@ -1 +0,0 @@
-export declare const getCurrentPosition: () => Promise<GeolocationCoordinates>;

package/lib/utils/getCurrentPosition.js

@@ -1,2 +0,0 @@
-export const getCurrentPosition = async () => new Promise((resolve) => navigator.geolocation.getCurrentPosition(({ coords }) => resolve(coords)));
-//# sourceMappingURL=getCurrentPosition.js.map

package/lib/utils/getCurrentPosition.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"getCurrentPosition.js","sourceRoot":"","sources":["../../src/utils/getCurrentPosition.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,KAAK,IAAI,EAAE,CAC3C,IAAI,OAAO,CAAyB,CAAC,OAAO,EAAE,EAAE,CAC9C,SAAS,CAAC,WAAW,CAAC,kBAAkB,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAC1E,CAAC"}