@doyourjob/gravity-ui-page-constructor 5.31.28 → 5.31.30

package/build/cjs/blocks/MarqueeLinks/MarqueeLinks.js

@@ -9,12 +9,12 @@ const components_1 = require("../../components");
 const utils_1 = require("../../utils");
 const b = (0, utils_1.block)('marquee-links-block');
 const MarqueeLinksBlock = ({ title, description, textAlign = 'left', speed = 10, items, }) => {
-    const renderItem = (0, react_1.useCallback)((item) => {
+    const renderItem = (0, react_1.useCallback)((item, index) => {
         if (item.url) {
-            return (react_1.default.createElement(uikit_1.Link, { key: item.src, href: item.url, extraProps: { tabIndex: -1 } },
+            return (react_1.default.createElement(uikit_1.Link, { key: item.src + index, href: item.url, extraProps: { tabIndex: -1 } },
                 react_1.default.createElement(components_1.Image, { src: item.src, alt: "" })));
         }
-        return react_1.default.createElement(components_1.Image, { src: item.src, key: item.src, alt: "" });
+        return react_1.default.createElement(components_1.Image, { src: item.src + index, key: item.src, alt: "" });
     }, []);
     if (!items.length)
         return null;

package/build/cjs/blocks/RelevantPosts/RelevantPosts.d.ts

@@ -1,3 +1,3 @@
 import { RelevantPostsBlockProps } from '../../models';
-export declare const RelevantPosts: ({ title, description, date, tags, services, pinnedPost, }: RelevantPostsBlockProps) => JSX.Element;
+export declare const RelevantPosts: ({ title, description, date, dateStart, dateEnd, tags, services, pinnedPost, }: RelevantPostsBlockProps) => JSX.Element;
 export default RelevantPosts;

package/build/cjs/blocks/RelevantPosts/RelevantPosts.js

@@ -14,7 +14,7 @@ const colSizes = {
     lg: 2,
     sm: 1,
 };
-const RelevantPosts = ({ title, description, date, tags, services, pinnedPost, }) => {
+const RelevantPosts = ({ title, description, date, dateStart, dateEnd, tags, services, pinnedPost, }) => {
     const [now, setNow] = react_1.default.useState(null);
     const { posts } = (0, react_1.useContext)(relevantPostsContext_1.RelevantPostsContext);
     (0, react_1.useEffect)(() => {
@@ -27,27 +27,34 @@ const RelevantPosts = ({ title, description, date, tags, services, pinnedPost, }
             var _a, _b;
             const itemDate = new Date(item.dateTime);
             let isDateMatch = true;
-            if (date === 'today') {
-                const startOfToday = new Date(now);
-                startOfToday.setHours(0, 0, 0, 0);
-                const endOfToday = new Date(now);
-                endOfToday.setHours(23, 59, 59, 999);
-                isDateMatch = itemDate >= startOfToday && itemDate <= endOfToday;
-            }
-            else if (date === 'week') {
-                const weekAgo = new Date(now);
-                weekAgo.setDate(now.getDate() - 7);
-                isDateMatch = itemDate >= weekAgo && itemDate <= now;
-            }
-            else if (date === 'month') {
-                const monthAgo = new Date(now);
-                monthAgo.setMonth(now.getMonth() - 1);
-                isDateMatch = itemDate >= monthAgo && itemDate <= now;
-            }
-            else if (typeof date === 'object' && (date.start || date.end)) {
-                const startDate = date.start ? new Date(date.start) : new Date('1970-01-01');
-                const endDate = date.end ? new Date(date.end) : now;
-                isDateMatch = itemDate >= startDate && itemDate <= endDate;
+            switch (date) {
+                case 'today': {
+                    const startOfToday = new Date(now);
+                    startOfToday.setHours(0, 0, 0, 0);
+                    const endOfToday = new Date(now);
+                    endOfToday.setHours(23, 59, 59, 999);
+                    isDateMatch = itemDate >= startOfToday && itemDate <= endOfToday;
+                    break;
+                }
+                case 'week': {
+                    const weekAgo = new Date(now);
+                    weekAgo.setDate(now.getDate() - 7);
+                    isDateMatch = itemDate >= weekAgo && itemDate <= now;
+                    break;
+                }
+                case 'month': {
+                    const monthAgo = new Date(now);
+                    monthAgo.setMonth(now.getMonth() - 1);
+                    isDateMatch = itemDate >= monthAgo && itemDate <= now;
+                    break;
+                }
+                default: {
+                    if (dateStart || dateEnd) {
+                        const startDate = dateStart ? new Date(dateStart) : new Date('1970-01-01');
+                        const endDate = dateEnd ? new Date(dateEnd) : now;
+                        isDateMatch = itemDate >= startDate && itemDate <= endDate;
+                    }
+                }
             }
             // Фильтрация по тегам
             const isTagMatch = !tags || tags.length === 0 || ((_a = item.tags) === null || _a === void 0 ? void 0 : _a.some((tag) => tags.includes(tag.slug)));
@@ -57,7 +64,7 @@ const RelevantPosts = ({ title, description, date, tags, services, pinnedPost, }
                 ((_b = item.services) === null || _b === void 0 ? void 0 : _b.some((s) => services.includes(s)));
             return isDateMatch && isTagMatch && isServiceMatch;
         });
-    }, [now, posts, date, tags, services]);
+    }, [now, posts, date, tags, services, dateStart, dateEnd]);
     const [findedPinnedPost, restPosts] = (0, react_1.useMemo)(() => {
         if (!pinnedPost || filteredPosts.length === 0)
             return [undefined, filteredPosts];

package/build/cjs/blocks/RelevantPosts/schema.d.ts

@@ -4,28 +4,14 @@ export declare const RelevantPostsBlock: {
         required: never[];
         properties: {
             date: {
-                oneOf: ({
-                    type: string;
-                    enum: string[];
-                    additionalProperties?: undefined;
-                    required?: undefined;
-                    properties?: undefined;
-                    optionName?: undefined;
-                } | {
-                    type: string;
-                    additionalProperties: boolean;
-                    required: never[];
-                    properties: {
-                        start: {
-                            type: string;
-                        };
-                        end: {
-                            type: string;
-                        };
-                    };
-                    optionName: string;
-                    enum?: undefined;
-                })[];
+                type: string;
+                enum: string[];
+            };
+            dateStart: {
+                type: string;
+            };
+            dateEnd: {
+                type: string;
             };
             tags: {
                 type: string;

package/build/cjs/blocks/RelevantPosts/schema.js

@@ -7,26 +7,12 @@ exports.RelevantPostsBlock = {
         additionalProperties: false,
         required: [],
         properties: Object.assign(Object.assign(Object.assign({}, common_1.BaseProps), common_1.BlockHeaderProps), { date: {
-                oneOf: [
-                    {
-                        type: 'string',
-                        enum: ['today', 'week', 'month'],
-                    },
-                    {
-                        type: 'object',
-                        additionalProperties: false,
-                        required: [],
-                        properties: {
-                            start: {
-                                type: 'string',
-                            },
-                            end: {
-                                type: 'string',
-                            },
-                        },
-                        optionName: 'options',
-                    },
-                ],
+                type: 'string',
+                enum: ['today', 'week', 'month'],
+            }, dateStart: {
+                type: 'string',
+            }, dateEnd: {
+                type: 'string',
             }, tags: {
                 type: 'array',
                 items: {

package/build/cjs/constructor-items.d.ts

@@ -22,7 +22,7 @@ export declare const blockMap: {
     "solutions-block": () => JSX.Element;
     "events-feed-block": ({ image, title }: import("./models").EventsFeedBlockProps) => JSX.Element;
     "blog-feed-block": ({ image, title }: import("./models").BlogFeedBlockProps) => JSX.Element;
-    "relevant-posts-block": ({ title, description, date, tags, services, pinnedPost, }: import("./models").RelevantPostsBlockProps) => JSX.Element;
+    "relevant-posts-block": ({ title, description, date, dateStart, dateEnd, tags, services, pinnedPost, }: import("./models").RelevantPostsBlockProps) => JSX.Element;
     "press-releases-block": ({ title }: import("./models").PressReleasesBlockProps) => JSX.Element;
     "highlight-table-block": (props: import("./models").HighlightTableBlockProps) => JSX.Element;
     "link-table-block": ({ title, items }: import("./models").LinkTableBlockProps) => JSX.Element;

package/build/cjs/models/constructor-items/blocks.d.ts

@@ -311,10 +311,9 @@ export interface BlogFeedBlockProps {
 export interface RelevantPostsBlockProps {
     title?: TitleItemProps | string;
     description?: string;
-    date?: {
-        start?: string;
-        end?: string;
-    } | 'today' | 'week' | 'month';
+    date?: 'today' | 'week' | 'month';
+    dateStart?: string;
+    dateEnd?: string;
     tags?: string[];
     services?: string[];
     pinnedPost?: boolean;

package/build/esm/blocks/MarqueeLinks/MarqueeLinks.js

@@ -6,12 +6,12 @@ import { block } from '../../utils';
 import './MarqueeLinks.css';
 const b = block('marquee-links-block');
 export const MarqueeLinksBlock = ({ title, description, textAlign = 'left', speed = 10, items, }) => {
-    const renderItem = useCallback((item) => {
+    const renderItem = useCallback((item, index) => {
         if (item.url) {
-            return (React.createElement(Link, { key: item.src, href: item.url, extraProps: { tabIndex: -1 } },
+            return (React.createElement(Link, { key: item.src + index, href: item.url, extraProps: { tabIndex: -1 } },
                 React.createElement(Image, { src: item.src, alt: "" })));
         }
-        return React.createElement(Image, { src: item.src, key: item.src, alt: "" });
+        return React.createElement(Image, { src: item.src + index, key: item.src, alt: "" });
     }, []);
     if (!items.length)
         return null;

package/build/esm/blocks/RelevantPosts/RelevantPosts.d.ts

@@ -1,4 +1,4 @@
 import { RelevantPostsBlockProps } from '../../models';
 import './RelevantPosts.css';
-export declare const RelevantPosts: ({ title, description, date, tags, services, pinnedPost, }: RelevantPostsBlockProps) => JSX.Element;
+export declare const RelevantPosts: ({ title, description, date, dateStart, dateEnd, tags, services, pinnedPost, }: RelevantPostsBlockProps) => JSX.Element;
 export default RelevantPosts;

package/build/esm/blocks/RelevantPosts/RelevantPosts.js

@@ -11,7 +11,7 @@ const colSizes = {
     lg: 2,
     sm: 1,
 };
-export const RelevantPosts = ({ title, description, date, tags, services, pinnedPost, }) => {
+export const RelevantPosts = ({ title, description, date, dateStart, dateEnd, tags, services, pinnedPost, }) => {
     const [now, setNow] = React.useState(null);
     const { posts } = useContext(RelevantPostsContext);
     useEffect(() => {
@@ -24,27 +24,34 @@ export const RelevantPosts = ({ title, description, date, tags, services, pinned
             var _a, _b;
             const itemDate = new Date(item.dateTime);
             let isDateMatch = true;
-            if (date === 'today') {
-                const startOfToday = new Date(now);
-                startOfToday.setHours(0, 0, 0, 0);
-                const endOfToday = new Date(now);
-                endOfToday.setHours(23, 59, 59, 999);
-                isDateMatch = itemDate >= startOfToday && itemDate <= endOfToday;
-            }
-            else if (date === 'week') {
-                const weekAgo = new Date(now);
-                weekAgo.setDate(now.getDate() - 7);
-                isDateMatch = itemDate >= weekAgo && itemDate <= now;
-            }
-            else if (date === 'month') {
-                const monthAgo = new Date(now);
-                monthAgo.setMonth(now.getMonth() - 1);
-                isDateMatch = itemDate >= monthAgo && itemDate <= now;
-            }
-            else if (typeof date === 'object' && (date.start || date.end)) {
-                const startDate = date.start ? new Date(date.start) : new Date('1970-01-01');
-                const endDate = date.end ? new Date(date.end) : now;
-                isDateMatch = itemDate >= startDate && itemDate <= endDate;
+            switch (date) {
+                case 'today': {
+                    const startOfToday = new Date(now);
+                    startOfToday.setHours(0, 0, 0, 0);
+                    const endOfToday = new Date(now);
+                    endOfToday.setHours(23, 59, 59, 999);
+                    isDateMatch = itemDate >= startOfToday && itemDate <= endOfToday;
+                    break;
+                }
+                case 'week': {
+                    const weekAgo = new Date(now);
+                    weekAgo.setDate(now.getDate() - 7);
+                    isDateMatch = itemDate >= weekAgo && itemDate <= now;
+                    break;
+                }
+                case 'month': {
+                    const monthAgo = new Date(now);
+                    monthAgo.setMonth(now.getMonth() - 1);
+                    isDateMatch = itemDate >= monthAgo && itemDate <= now;
+                    break;
+                }
+                default: {
+                    if (dateStart || dateEnd) {
+                        const startDate = dateStart ? new Date(dateStart) : new Date('1970-01-01');
+                        const endDate = dateEnd ? new Date(dateEnd) : now;
+                        isDateMatch = itemDate >= startDate && itemDate <= endDate;
+                    }
+                }
             }
             // Фильтрация по тегам
             const isTagMatch = !tags || tags.length === 0 || ((_a = item.tags) === null || _a === void 0 ? void 0 : _a.some((tag) => tags.includes(tag.slug)));
@@ -54,7 +61,7 @@ export const RelevantPosts = ({ title, description, date, tags, services, pinned
                 ((_b = item.services) === null || _b === void 0 ? void 0 : _b.some((s) => services.includes(s)));
             return isDateMatch && isTagMatch && isServiceMatch;
         });
-    }, [now, posts, date, tags, services]);
+    }, [now, posts, date, tags, services, dateStart, dateEnd]);
     const [findedPinnedPost, restPosts] = useMemo(() => {
         if (!pinnedPost || filteredPosts.length === 0)
             return [undefined, filteredPosts];

package/build/esm/blocks/RelevantPosts/schema.d.ts

@@ -4,28 +4,14 @@ export declare const RelevantPostsBlock: {
         required: never[];
         properties: {
             date: {
-                oneOf: ({
-                    type: string;
-                    enum: string[];
-                    additionalProperties?: undefined;
-                    required?: undefined;
-                    properties?: undefined;
-                    optionName?: undefined;
-                } | {
-                    type: string;
-                    additionalProperties: boolean;
-                    required: never[];
-                    properties: {
-                        start: {
-                            type: string;
-                        };
-                        end: {
-                            type: string;
-                        };
-                    };
-                    optionName: string;
-                    enum?: undefined;
-                })[];
+                type: string;
+                enum: string[];
+            };
+            dateStart: {
+                type: string;
+            };
+            dateEnd: {
+                type: string;
             };
             tags: {
                 type: string;

package/build/esm/blocks/RelevantPosts/schema.js

@@ -4,26 +4,12 @@ export const RelevantPostsBlock = {
         additionalProperties: false,
         required: [],
         properties: Object.assign(Object.assign(Object.assign({}, BaseProps), BlockHeaderProps), { date: {
-                oneOf: [
-                    {
-                        type: 'string',
-                        enum: ['today', 'week', 'month'],
-                    },
-                    {
-                        type: 'object',
-                        additionalProperties: false,
-                        required: [],
-                        properties: {
-                            start: {
-                                type: 'string',
-                            },
-                            end: {
-                                type: 'string',
-                            },
-                        },
-                        optionName: 'options',
-                    },
-                ],
+                type: 'string',
+                enum: ['today', 'week', 'month'],
+            }, dateStart: {
+                type: 'string',
+            }, dateEnd: {
+                type: 'string',
             }, tags: {
                 type: 'array',
                 items: {

package/build/esm/constructor-items.d.ts

@@ -22,7 +22,7 @@ export declare const blockMap: {
     "solutions-block": () => JSX.Element;
     "events-feed-block": ({ image, title }: import("./models").EventsFeedBlockProps) => JSX.Element;
     "blog-feed-block": ({ image, title }: import("./models").BlogFeedBlockProps) => JSX.Element;
-    "relevant-posts-block": ({ title, description, date, tags, services, pinnedPost, }: import("./models").RelevantPostsBlockProps) => JSX.Element;
+    "relevant-posts-block": ({ title, description, date, dateStart, dateEnd, tags, services, pinnedPost, }: import("./models").RelevantPostsBlockProps) => JSX.Element;
     "press-releases-block": ({ title }: import("./models").PressReleasesBlockProps) => JSX.Element;
     "highlight-table-block": (props: import("./models").HighlightTableBlockProps) => JSX.Element;
     "link-table-block": ({ title, items }: import("./models").LinkTableBlockProps) => JSX.Element;

package/build/esm/models/constructor-items/blocks.d.ts

@@ -311,10 +311,9 @@ export interface BlogFeedBlockProps {
 export interface RelevantPostsBlockProps {
     title?: TitleItemProps | string;
     description?: string;
-    date?: {
-        start?: string;
-        end?: string;
-    } | 'today' | 'week' | 'month';
+    date?: 'today' | 'week' | 'month';
+    dateStart?: string;
+    dateEnd?: string;
     tags?: string[];
     services?: string[];
     pinnedPost?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@doyourjob/gravity-ui-page-constructor",
-  "version": "5.31.28",
+  "version": "5.31.30",
   "description": "Gravity UI Page Constructor",
   "license": "MIT",
   "repository": {