denwa-web-shared 1.0.33 → 1.0.35

package/dist/server/index.cjs.js

@@ -278,6 +278,12 @@ const preparePageParam = (page) => {
   }
   return 1;
 };
+const isNotEmptyHtml = (html) => {
+  return !!html && html !== '<p class="content-paragraph" ></p>';
+};
+const createCityLink = (city, href) => {
+  return `/${city}${href}`;
+};
 function r(e) {
   var t, f, n = "";
   if ("string" == typeof e || "number" == typeof e) n += e;
@@ -6770,65 +6776,57 @@ const BasePicture = ({
   loading = "lazy",
   ...pictureProps
 }) => {
-  const {
-    image1x,
-    image2x,
-    image1xWebp,
-    image2xWebp,
-    image1xAvif,
-    image2xAvif,
-    mobileImage1x,
-    mobileImage2x,
-    mobileImage1xWebp,
-    mobileImage2xWebp,
-    mobileImage1xAvif,
-    mobileImage2xAvif
-  } = data;
   return /* @__PURE__ */ jsxRuntime.jsxs("picture", { ...pictureProps, children: [
-    !!mobileImage1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
+    !!(data == null ? void 0 : data.mobileImage1xAvif) && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
-        srcSet: `${mobileImage1xAvif} 1x${mobileImage2xAvif ? `, ${mobileImage2xAvif} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.mobileImage1xAvif} 1x${(data == null ? void 0 : data.mobileImage2xAvif) ? `, ${data == null ? void 0 : data.mobileImage2xAvif} 2x` : ""}`,
         media: `(max-width: ${mobileMaxWidth}px)`,
         type: "image/avif"
       }
     ),
-    !!mobileImage1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
+    !!(data == null ? void 0 : data.mobileImage1xWebp) && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
-        srcSet: `${mobileImage1xWebp} 1x${mobileImage2xWebp ? `, ${mobileImage2xWebp} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.mobileImage1xWebp} 1x${(data == null ? void 0 : data.mobileImage2xWebp) ? `, ${data == null ? void 0 : data.mobileImage2xWebp} 2x` : ""}`,
         media: `(max-width: ${mobileMaxWidth}px)`,
         type: "image/webp"
       }
     ),
-    !!mobileImage1x && /* @__PURE__ */ jsxRuntime.jsx(
+    !!(data == null ? void 0 : data.mobileImage1x) && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
-        srcSet: `${mobileImage1x} 1x${mobileImage2x ? `, ${mobileImage2x} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.mobileImage1x} 1x${(data == null ? void 0 : data.mobileImage2x) ? `, ${data == null ? void 0 : data.mobileImage2x} 2x` : ""}`,
         media: `(max-width: ${mobileMaxWidth}px)`,
         type
       }
     ),
-    !!image1xAvif && /* @__PURE__ */ jsxRuntime.jsx(
+    !!(data == null ? void 0 : data.image1xAvif) && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
-        srcSet: `${image1xAvif} 1x${image2xAvif ? `, ${image2xAvif} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.image1xAvif} 1x${(data == null ? void 0 : data.image2xAvif) ? `, ${data == null ? void 0 : data.image2xAvif} 2x` : ""}`,
         type: "image/avif"
       }
     ),
-    !!image1xWebp && /* @__PURE__ */ jsxRuntime.jsx(
+    !!(data == null ? void 0 : data.image1xWebp) && /* @__PURE__ */ jsxRuntime.jsx(
       "source",
       {
-        srcSet: `${image1xWebp} 1x${image2xWebp ? `, ${image2xWebp} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.image1xWebp} 1x${(data == null ? void 0 : data.image2xWebp) ? `, ${data == null ? void 0 : data.image2xWebp} 2x` : ""}`,
         type: "image/webp"
       }
     ),
-    !!image1x && /* @__PURE__ */ jsxRuntime.jsx("source", { srcSet: `${image1x} 1x${image2x ? `, ${image2x} 2x` : ""}`, type }),
+    !!(data == null ? void 0 : data.image1x) && /* @__PURE__ */ jsxRuntime.jsx(
+      "source",
+      {
+        srcSet: `${data == null ? void 0 : data.image1x} 1x${(data == null ? void 0 : data.image2x) ? `, ${data == null ? void 0 : data.image2x} 2x` : ""}`,
+        type
+      }
+    ),
     /* @__PURE__ */ jsxRuntime.jsx(
       "img",
       {
         ...imgProps,
-        src: image1x,
+        src: data == null ? void 0 : data.image1x,
         alt,
         loading,
         decoding: loading === "eager" ? "sync" : "async",
@@ -6845,6 +6843,7 @@ exports.checkCorrectFileObject = checkCorrectFileObject;
 exports.checkCorrectImageObject = checkCorrectImageObject;
 exports.cn = cn;
 exports.convertPhoneMask = convertPhoneMask;
+exports.createCityLink = createCityLink;
 exports.generatePaginationArray = generatePaginationArray;
 exports.getByKey = getByKey;
 exports.getImagePrefix = getImagePrefix;
@@ -6852,6 +6851,7 @@ exports.getNumberFormatter = getNumberFormatter;
 exports.getSubdomain = getSubdomain;
 exports.getUploadFileUrl = getUploadFileUrl;
 exports.getUploadImageUrl = getUploadImageUrl;
+exports.isNotEmptyHtml = isNotEmptyHtml;
 exports.parseStringToKeyValue = parseStringToKeyValue;
 exports.prepareColor = prepareColor;
 exports.prepareLocalMetaData = prepareLocalMetaData;

package/dist/server/index.es.js

@@ -276,6 +276,12 @@ const preparePageParam = (page) => {
   }
   return 1;
 };
+const isNotEmptyHtml = (html) => {
+  return !!html && html !== '<p class="content-paragraph" ></p>';
+};
+const createCityLink = (city, href) => {
+  return `/${city}${href}`;
+};
 function r(e) {
   var t, f, n = "";
   if ("string" == typeof e || "number" == typeof e) n += e;
@@ -6768,65 +6774,57 @@ const BasePicture = ({
   loading = "lazy",
   ...pictureProps
 }) => {
-  const {
-    image1x,
-    image2x,
-    image1xWebp,
-    image2xWebp,
-    image1xAvif,
-    image2xAvif,
-    mobileImage1x,
-    mobileImage2x,
-    mobileImage1xWebp,
-    mobileImage2xWebp,
-    mobileImage1xAvif,
-    mobileImage2xAvif
-  } = data;
   return /* @__PURE__ */ jsxs("picture", { ...pictureProps, children: [
-    !!mobileImage1xAvif && /* @__PURE__ */ jsx(
+    !!(data == null ? void 0 : data.mobileImage1xAvif) && /* @__PURE__ */ jsx(
       "source",
       {
-        srcSet: `${mobileImage1xAvif} 1x${mobileImage2xAvif ? `, ${mobileImage2xAvif} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.mobileImage1xAvif} 1x${(data == null ? void 0 : data.mobileImage2xAvif) ? `, ${data == null ? void 0 : data.mobileImage2xAvif} 2x` : ""}`,
         media: `(max-width: ${mobileMaxWidth}px)`,
         type: "image/avif"
       }
     ),
-    !!mobileImage1xWebp && /* @__PURE__ */ jsx(
+    !!(data == null ? void 0 : data.mobileImage1xWebp) && /* @__PURE__ */ jsx(
       "source",
       {
-        srcSet: `${mobileImage1xWebp} 1x${mobileImage2xWebp ? `, ${mobileImage2xWebp} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.mobileImage1xWebp} 1x${(data == null ? void 0 : data.mobileImage2xWebp) ? `, ${data == null ? void 0 : data.mobileImage2xWebp} 2x` : ""}`,
         media: `(max-width: ${mobileMaxWidth}px)`,
         type: "image/webp"
       }
     ),
-    !!mobileImage1x && /* @__PURE__ */ jsx(
+    !!(data == null ? void 0 : data.mobileImage1x) && /* @__PURE__ */ jsx(
       "source",
       {
-        srcSet: `${mobileImage1x} 1x${mobileImage2x ? `, ${mobileImage2x} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.mobileImage1x} 1x${(data == null ? void 0 : data.mobileImage2x) ? `, ${data == null ? void 0 : data.mobileImage2x} 2x` : ""}`,
         media: `(max-width: ${mobileMaxWidth}px)`,
         type
       }
     ),
-    !!image1xAvif && /* @__PURE__ */ jsx(
+    !!(data == null ? void 0 : data.image1xAvif) && /* @__PURE__ */ jsx(
       "source",
       {
-        srcSet: `${image1xAvif} 1x${image2xAvif ? `, ${image2xAvif} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.image1xAvif} 1x${(data == null ? void 0 : data.image2xAvif) ? `, ${data == null ? void 0 : data.image2xAvif} 2x` : ""}`,
         type: "image/avif"
       }
     ),
-    !!image1xWebp && /* @__PURE__ */ jsx(
+    !!(data == null ? void 0 : data.image1xWebp) && /* @__PURE__ */ jsx(
       "source",
       {
-        srcSet: `${image1xWebp} 1x${image2xWebp ? `, ${image2xWebp} 2x` : ""}`,
+        srcSet: `${data == null ? void 0 : data.image1xWebp} 1x${(data == null ? void 0 : data.image2xWebp) ? `, ${data == null ? void 0 : data.image2xWebp} 2x` : ""}`,
         type: "image/webp"
       }
     ),
-    !!image1x && /* @__PURE__ */ jsx("source", { srcSet: `${image1x} 1x${image2x ? `, ${image2x} 2x` : ""}`, type }),
+    !!(data == null ? void 0 : data.image1x) && /* @__PURE__ */ jsx(
+      "source",
+      {
+        srcSet: `${data == null ? void 0 : data.image1x} 1x${(data == null ? void 0 : data.image2x) ? `, ${data == null ? void 0 : data.image2x} 2x` : ""}`,
+        type
+      }
+    ),
     /* @__PURE__ */ jsx(
       "img",
       {
         ...imgProps,
-        src: image1x,
+        src: data == null ? void 0 : data.image1x,
         alt,
         loading,
         decoding: loading === "eager" ? "sync" : "async",
@@ -6844,6 +6842,7 @@ export {
   checkCorrectImageObject,
   cn,
   convertPhoneMask,
+  createCityLink,
   generatePaginationArray,
   getByKey,
   getImagePrefix,
@@ -6851,6 +6850,7 @@ export {
   getSubdomain,
   getUploadFileUrl,
   getUploadImageUrl,
+  isNotEmptyHtml,
   parseStringToKeyValue,
   prepareColor,
   prepareLocalMetaData,

package/dist/server/lib/utils.d.ts

@@ -134,3 +134,14 @@ export declare const arrayToKeyValueObject: <T extends string>(arr: T[]) => Reco
  * @param page - Номер страницы
  */
 export declare const preparePageParam: (page: string | number | undefined) => number;
+/**
+ * @description Проверка html на пустоту
+ * @param html - Html разметка редактора
+ */
+export declare const isNotEmptyHtml: (html: string | null | undefined) => boolean;
+/**
+ * @description Подстановка города в путь ссылки
+ * @param city - Город
+ * @param href - Ссылка
+ */
+export declare const createCityLink: (city: string, href: string) => string;

package/dist/server/ui/image.d.ts

@@ -2,8 +2,8 @@ import { DetailedHTMLProps, FC, HTMLAttributes, ImgHTMLAttributes } from 'react'
 import { ImageType } from '../types';
 export interface BasePictureProps extends DetailedHTMLProps<HTMLAttributes<HTMLPictureElement>, HTMLPictureElement> {
     imgProps?: DetailedHTMLProps<ImgHTMLAttributes<HTMLImageElement>, HTMLImageElement>;
-    data: PictureData;
-    type: ImageType;
+    data: PictureData | undefined;
+    type: ImageType | undefined;
     alt: string;
     mobileMaxWidth?: number;
     loading?: 'eager' | 'lazy';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "denwa-web-shared",
   "private": false,
-  "version": "1.0.33",
+  "version": "1.0.35",
   "type": "module",
   "author": "Denwa",
   "main": "dist/denwa-web-shared.cjs.js",