@redneckz/wildless-cms-uni-blocks 0.8.6 → 0.8.8

package/src/hooks/useLink.ts

@@ -1,7 +1,7 @@
 import type { LinkProps } from '../model/LinkProps';
 import { projectSettings } from '../ProjectSettings';
 import { useBlockRouter } from '../services/BlockRouter/useBlockRouter';
-import { isHash, isLocalURL, isURL, joinPath } from '../utils/url';
+import { isHash, isLocalURL, joinPath } from '../utils/url';
 import { handlerDecorator } from './handlerDecorator';
 import { useRouter } from './useRouter';
 
@@ -19,14 +19,19 @@ export function useLink(isRemote?: boolean) {
 
   return <L extends Partial<LinkProps & Clickable>>(props: L): L & Clickable => ({
     ...props,
-    href:
-      projectSettings.BASE_PATH && props.href && !(isRemote || isURL(props.href))
-        ? joinPath(projectSettings.BASE_PATH, props.href)
-        : props.href,
+    href: adjustHref(props.href),
     'aria-label': props.text,
     onClick: handlerDecorator(handleHref(props), props),
   });
 
+  function adjustHref(href: string | undefined) {
+    const isRelativeToBase = !isRemote && href?.startsWith('/');
+
+    return projectSettings.BASE_PATH && href && isRelativeToBase
+      ? joinPath(projectSettings.BASE_PATH, href)
+      : href;
+  }
+
   function handleHref({ href, target, onClick }: Partial<LinkProps & Clickable>) {
     return (ev?: PreventableEvent) => {
       onClick && onClick(ev);

package/src/model/DefaultListItemType.ts

@@ -0,0 +1,4 @@
+export interface DefaultListItemType {
+  /** @default default */
+  type: 'default';
+}

package/src/model/RichTextItem.ts

@@ -0,0 +1,9 @@
+import type { RichTextProps } from '../ui-kit/RichText/RichTextProps';
+
+/**
+ * @title Форматированный текст
+ */
+export interface RichTextItem extends RichTextProps {
+  /** @default rte */
+  type: 'rte';
+}

package/src/ui-kit/BenefitItem/BenefitItemProps.ts

@@ -1,8 +1,9 @@
 import type { BlockVersion } from '../../model/BlockVersion';
+import type { DefaultListItemType } from '../../model/DefaultListItemType';
 import type { DescriptionProps, LabelProps } from '../../model/HeadlineType';
 import type { IconVersion } from '../../model/IconVersion';
 import type { IconProps } from '../../model/Picture';
-import { RichTextProps } from '../RichText/RichTextProps';
+import type { RichTextItem } from '../../model/RichTextItem';
 
 export interface BenefitItemCommonProps {
   /** @hidden */
@@ -18,18 +19,7 @@ export type BenefitItemProps = DescriptionProps & LabelProps & IconProps;
 /**
  * @title Стандартный бенефит
  */
-type DefaultBenefit = BenefitItemProps & {
-  /** @default default */
-  type: 'default';
-};
-
-/**
- * @title Форматированный текст
- */
-type RichText = RichTextProps & {
-  /** @default rte */
-  type: 'rte';
-};
+type DefaultBenefit = BenefitItemProps & DefaultListItemType;
 
 /**
  * @title Преимущество
@@ -37,7 +27,7 @@ type RichText = RichTextProps & {
  *  "type": "default"
  * }
  */
-export type ComplexBenefitProps = DefaultBenefit | RichText;
+export type ComplexBenefitProps = DefaultBenefit | RichTextItem;
 
 /**
  * @title Преимущество

package/dist/model/BlurVersion.js

@@ -1 +0,0 @@
-//# sourceMappingURL=BlurVersion.js.map

package/dist/model/BlurVersion.js.map

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

package/lib/model/BlurVersion.js

@@ -1 +0,0 @@
-//# sourceMappingURL=BlurVersion.js.map

package/lib/model/BlurVersion.js.map

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

package/mobile/dist/model/BlurVersion.js

@@ -1 +0,0 @@
-//# sourceMappingURL=BlurVersion.js.map

package/mobile/dist/model/BlurVersion.js.map

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

package/mobile/lib/model/BlurVersion.js

@@ -1 +0,0 @@
-//# sourceMappingURL=BlurVersion.js.map

package/mobile/lib/model/BlurVersion.js.map

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