@gravity-ui/blog-constructor 4.0.0-alpha.0 → 4.0.0

package/build/esm/components/FeedHeader/components/Controls/Controls.js

@@ -10,7 +10,7 @@ import metrika from '../../../../counters/metrika.js';
 import { MetrikaCounter } from '../../../../counters/utils';
 import { Keyset, i18 } from '../../../../i18n';
 import { Save } from '../../../../icons/Save';
-import { DefaultEventNames, } from '../../../../models/common';
+import { DefaultEventNames } from '../../../../models/common';
 import { block } from '../../../../utils/cn';
 import { Search } from '../../../Search/Search';
 import { renderFilter, renderOption, renderSwitcher } from './customRenders';
@@ -19,7 +19,7 @@ const b = block('feed-controls');
 const ICON_SIZE = 16;
 const DEFAULT_PAGE = 1;
 const VIRTUALIZATION_THRESHOLD = 1000;
-export const Controls = ({ setIsFetching, tags = [], services = [], handleChangeQuery, queryParams, }) => {
+export const Controls = ({ handleLoadData, tags = [], services = [], queryParams, }) => {
     const { hasLikes } = useContext(LikesContext);
     const handleAnalyticsTag = useAnalytics(DefaultEventNames.Tag);
     const handleAnalyticsService = useAnalytics(DefaultEventNames.Service);
@@ -28,21 +28,25 @@ export const Controls = ({ setIsFetching, tags = [], services = [], handleChange
     const [savedOnly, setSavedOnly] = useState(savedOnlyInitial === 'true');
     const [search, setSearch] = useState(searchInitial);
     const handleSavedOnly = () => {
-        handleChangeQuery({
-            savedOnly: savedOnly ? '' : 'true',
-            search: '',
-            tags: '',
-            page: DEFAULT_PAGE,
-            services: '',
-        });
         handleAnalyticsSaveOnly();
         setSavedOnly(!savedOnly);
-        setIsFetching(true);
+        handleLoadData({
+            page: DEFAULT_PAGE,
+            query: {
+                savedOnly: savedOnly ? '' : 'true',
+                search: '',
+                tags: '',
+                page: DEFAULT_PAGE,
+                services: '',
+            },
+        });
     };
     const handleSearch = (searchValue) => {
-        handleChangeQuery({ search: searchValue, page: DEFAULT_PAGE });
         setSearch(searchValue);
-        setIsFetching(true);
+        handleLoadData({
+            page: DEFAULT_PAGE,
+            query: { search: searchValue, page: DEFAULT_PAGE },
+        });
     };
     const handleTagSelect = (selectedTags) => {
         /**
@@ -55,11 +59,13 @@ export const Controls = ({ setIsFetching, tags = [], services = [], handleChange
             theme: selectedTags[0],
         });
         const isEmptyTag = selectedTags.some((tag) => tag === 'empty');
-        handleChangeQuery({
-            tags: isEmptyTag ? '' : selectedTags[0],
+        handleLoadData({
             page: DEFAULT_PAGE,
+            query: {
+                tags: isEmptyTag ? '' : selectedTags[0],
+                page: DEFAULT_PAGE,
+            },
         });
-        setIsFetching(true);
     };
     const handleServicesSelect = (selectedServices) => {
         const forMetrikaServices = services.filter((service) => {
@@ -76,8 +82,10 @@ export const Controls = ({ setIsFetching, tags = [], services = [], handleChange
             service: metrikaAsString,
         });
         const servicesAsString = selectedServices.join(',');
-        handleChangeQuery({ services: servicesAsString, page: DEFAULT_PAGE });
-        setIsFetching(true);
+        handleLoadData({
+            page: DEFAULT_PAGE,
+            query: { services: servicesAsString, page: DEFAULT_PAGE },
+        });
     };
     const tagsItems = useMemo(() => [{ value: 'empty', content: i18(Keyset.AllTags) }, ...tags], [tags]);
     const servicesItems = useMemo(() => (servicesInitial ? [...servicesInitial.split(',')] : []), [servicesInitial]);

package/build/esm/components/Paginator/Paginator.d.ts

@@ -1,3 +1,3 @@
 import { PaginatorProps } from './types';
 import './Paginator.css';
-export declare const Paginator: ({ itemsPerPage, totalItems, maxPages, page, className, loading, onPageChange, pageCountForShowSupportButtons, }: PaginatorProps) => JSX.Element | null;
+export declare const Paginator: ({ itemsPerPage, totalItems, maxPages, page, className, onPageChange, pageCountForShowSupportButtons, }: PaginatorProps) => JSX.Element | null;

package/build/esm/components/Paginator/Paginator.js

@@ -26,7 +26,7 @@ import { getPageConfigs, getPagesCount } from './utils';
 import './Paginator.css';
 const b = block('paginator');
 const DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS = 6;
-export const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className, loading, onPageChange, pageCountForShowSupportButtons = DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS, }) => {
+export const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className, onPageChange, pageCountForShowSupportButtons = DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS, }) => {
     const [pagesCount, setPagesCount] = useState(getPagesCount({ itemsPerPage, totalItems, maxPages }));
     useEffect(() => {
         const count = getPagesCount({ itemsPerPage, totalItems, maxPages });
@@ -95,7 +95,7 @@ export const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className,
     }
     const renderPaginatorItem = (item) => {
         const { key } = item, rest = __rest(item, ["key"]);
-        return React.createElement(PaginatorItem, Object.assign({ key: `page_${key}` }, rest, { loading: loading }));
+        return React.createElement(PaginatorItem, Object.assign({ key: `page_${key}` }, rest));
     };
     return (React.createElement("div", { className: b('pagination') },
         page > 1 && (React.createElement("div", { className: b('pagination-block') },

package/build/esm/components/Paginator/types.d.ts

@@ -15,7 +15,6 @@ export type PaginatorProps = {
     totalItems: number;
     itemsPerPage: number;
     maxPages: number;
-    loading: boolean;
     onPageChange: (page: number) => void;
     pageCountForShowSupportButtons?: number;
 } & ClassNameProps;

package/build/esm/components/Posts/Posts.css

@@ -1,9 +1,15 @@
 /* use this for style redefinitions to awoid problems with
 unpredictable css rules order in build */
+.bc-posts {
+  position: relative;
+}
 .bc-posts__cards-container, .bc-posts__pinned-container {
   padding-top: 24px;
   scroll-margin: 48px;
 }
+.bc-posts__cards-container_isLoading {
+  opacity: 0.7;
+}
 .bc-posts__pagination {
   display: flex;
   flex-direction: column;
@@ -25,4 +31,23 @@ unpredictable css rules order in build */
 }
 .bc-posts__paginator {
   padding-top: 12px;
+}
+.bc-posts__loaderContainer {
+  z-index: 6;
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 70%;
+  height: 100%;
+  background: linear-gradient(90deg, rgba(255, 255, 255, 0), rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0.5), rgba(255, 255, 255, 0.3), rgba(255, 255, 255, 0));
+  animation: shimmer 2s infinite linear;
+}
+
+@keyframes shimmer {
+  from {
+    transform: translateX(-200%);
+  }
+  to {
+    transform: translateX(300%);
+  }
 }

package/build/esm/components/Posts/Posts.d.ts

@@ -9,7 +9,6 @@ type PostCardProps = {
     postCountOnPage: number;
     perPageInQuery: number;
     isFetching: boolean;
-    isShowMoreFetching: boolean;
     handleShowMore: (value?: MouseEvent<HTMLButtonElement | HTMLAnchorElement>) => Promise<void> | void;
     handlePageChange: (value: number) => Promise<void> | void;
     postsOnPage?: PostData[];

package/build/esm/components/Posts/Posts.js

@@ -8,8 +8,9 @@ import { PostCard } from '../PostCard/PostCard';
 import { PostsEmpty } from '../PostsEmpty/PostsEmpty';
 import './Posts.css';
 const b = block('posts');
-export const Posts = ({ containerId, pinnedPostOnPage, currentPage, postsOnPage, isShowMoreVisible, errorShowMore, postCountOnPage, perPageInQuery, isFetching, isShowMoreFetching, handleShowMore, handlePageChange, pageCountForShowSupportButtons, }) => (React.createElement("div", { className: b() },
-    React.createElement("div", { id: containerId, className: b('cards-container') },
+export const Posts = ({ containerId, pinnedPostOnPage, currentPage, postsOnPage, isShowMoreVisible, errorShowMore, postCountOnPage, perPageInQuery, isFetching, handleShowMore, handlePageChange, pageCountForShowSupportButtons, }) => (React.createElement("div", { className: b() },
+    isFetching && React.createElement("div", { className: b('loaderContainer') }),
+    React.createElement("div", { id: containerId, className: b('cards-container', { isLoading: isFetching }) },
         pinnedPostOnPage && currentPage === 1 && (React.createElement("div", { className: b('pinned-container') },
             React.createElement(PostCard, { post: pinnedPostOnPage, size: "m", fullWidth: true, showTag: true }))),
         (postsOnPage === null || postsOnPage === void 0 ? void 0 : postsOnPage.length) ? (React.createElement(CardLayoutBlock, { title: '', colSizes: {
@@ -18,9 +19,9 @@ export const Posts = ({ containerId, pinnedPostOnPage, currentPage, postsOnPage,
                 md: 6,
             } }, postsOnPage === null || postsOnPage === void 0 ? void 0 : postsOnPage.map((post) => (React.createElement(PostCard, { key: post.id, post: post, showTag: true }))))) : (React.createElement(PostsEmpty, null))),
     React.createElement("div", { className: b('pagination') },
-        Boolean(isShowMoreVisible && (postsOnPage === null || postsOnPage === void 0 ? void 0 : postsOnPage.length)) && (React.createElement(Button, { view: "outlined", size: "xl", className: b('more-button'), onClick: handleShowMore, loading: isShowMoreFetching }, i18(Keyset.ActionLoadMore))),
+        Boolean(isShowMoreVisible && (postsOnPage === null || postsOnPage === void 0 ? void 0 : postsOnPage.length)) && (React.createElement(Button, { view: "outlined", size: "xl", className: b('more-button'), onClick: handleShowMore }, i18(Keyset.ActionLoadMore))),
         errorShowMore && (React.createElement("div", { className: b('error-show-more') },
             React.createElement("div", null, i18(Keyset.ErrorTitle)),
             React.createElement("div", null, i18(Keyset.PostLoadError)))),
         Boolean(currentPage && postCountOnPage) && (React.createElement("div", { className: b('paginator') },
-            React.createElement(Paginator, { onPageChange: handlePageChange, page: currentPage, totalItems: postCountOnPage, itemsPerPage: perPageInQuery, loading: isFetching, maxPages: Infinity, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))))));
+            React.createElement(Paginator, { onPageChange: handlePageChange, page: currentPage, totalItems: postCountOnPage, itemsPerPage: perPageInQuery, maxPages: Infinity, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))))));

package/build/esm/components/Search/Search.js

@@ -1,6 +1,6 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { debounce as lodashDebounce } from 'lodash';
 import { TextInput } from '@gravity-ui/uikit';
+import { debounce as lodashDebounce } from 'lodash';
 import { useIsIPhone } from '../../hooks/useIsIPhone';
 import { Keyset, i18 } from '../../i18n';
 import { Close } from '../../icons/Close';

package/build/esm/models/common.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
-import { IBrowser, IDevice } from 'ua-parser-js';
 import { HeaderBlockProps as PageConstructorHeaderBlockProps } from '@gravity-ui/page-constructor';
+import { IBrowser, IDevice } from 'ua-parser-js';
 import { Locale } from '../models/locale';
 export declare enum Theme {
     Light = "light",
@@ -161,3 +161,7 @@ export declare enum DefaultEventNames {
     Service = "selector-service-click",
     SaveOnly = "save-only-button-click"
 }
+export type FetchArgs = {
+    page?: number;
+    query: Query;
+};

package/build/esm/schema/index.d.ts

@@ -295,6 +295,87 @@ export declare const schemasForCustom: {
                                         type: string;
                                     })[];
                                 };
+                                fullscreen: {
+                                    type: string;
+                                };
+                                analyticsEvents: {
+                                    anyOf: ({
+                                        type: string;
+                                        additionalProperties: {
+                                            type: string;
+                                        };
+                                        required: string[];
+                                        properties: {
+                                            name: {
+                                                type: string;
+                                            };
+                                            type: {
+                                                type: string;
+                                            };
+                                            counters: {
+                                                type: string;
+                                                additionalProperties: boolean;
+                                                required: never[];
+                                                properties: {
+                                                    include: {
+                                                        type: string;
+                                                        items: {
+                                                            type: string;
+                                                        };
+                                                    };
+                                                    exclude: {
+                                                        type: string;
+                                                        items: {
+                                                            type: string;
+                                                        };
+                                                    };
+                                                };
+                                            };
+                                            context: {
+                                                type: string;
+                                            };
+                                        };
+                                    } | {
+                                        type: string;
+                                        items: {
+                                            type: string;
+                                            additionalProperties: {
+                                                type: string;
+                                            };
+                                            required: string[];
+                                            properties: {
+                                                name: {
+                                                    type: string;
+                                                };
+                                                type: {
+                                                    type: string;
+                                                };
+                                                counters: {
+                                                    type: string;
+                                                    additionalProperties: boolean;
+                                                    required: never[];
+                                                    properties: {
+                                                        include: {
+                                                            type: string;
+                                                            items: {
+                                                                type: string;
+                                                            };
+                                                        };
+                                                        exclude: {
+                                                            type: string;
+                                                            items: {
+                                                                type: string;
+                                                            };
+                                                        };
+                                                    };
+                                                };
+                                                context: {
+                                                    type: string;
+                                                };
+                                            };
+                                        };
+                                    })[];
+                                };
                             };
                         } | {
                             type: string;
@@ -1088,6 +1169,87 @@ export declare const schemasForCustom: {
                             type: string;
                         })[];
                     };
+                    fullscreen: {
+                        type: string;
+                    };
+                    analyticsEvents: {
+                        anyOf: ({
+                            type: string;
+                            additionalProperties: {
+                                type: string;
+                            };
+                            required: string[];
+                            properties: {
+                                name: {
+                                    type: string;
+                                };
+                                type: {
+                                    type: string;
+                                };
+                                counters: {
+                                    type: string;
+                                    additionalProperties: boolean;
+                                    required: never[];
+                                    properties: {
+                                        include: {
+                                            type: string;
+                                            items: {
+                                                type: string;
+                                            };
+                                        };
+                                        exclude: {
+                                            type: string;
+                                            items: {
+                                                type: string;
+                                            };
+                                        };
+                                    };
+                                };
+                                context: {
+                                    type: string;
+                                };
+                            };
+                        } | {
+                            type: string;
+                            items: {
+                                type: string;
+                                additionalProperties: {
+                                    type: string;
+                                };
+                                required: string[];
+                                properties: {
+                                    name: {
+                                        type: string;
+                                    };
+                                    type: {
+                                        type: string;
+                                    };
+                                    counters: {
+                                        type: string;
+                                        additionalProperties: boolean;
+                                        required: never[];
+                                        properties: {
+                                            include: {
+                                                type: string;
+                                                items: {
+                                                    type: string;
+                                                };
+                                            };
+                                            exclude: {
+                                                type: string;
+                                                items: {
+                                                    type: string;
+                                                };
+                                            };
+                                        };
+                                    };
+                                    context: {
+                                        type: string;
+                                    };
+                                };
+                            };
+                        })[];
+                    };
                     paddingTop: {
                         type: string;
                         enum: string[];

package/build/esm/utils/common.js

@@ -10,8 +10,8 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import { format, parse } from 'url';
-import { debounce, memoize } from 'lodash';
 import { isNewMetrikaFormat, } from '@gravity-ui/page-constructor';
+import { debounce, memoize } from 'lodash';
 import { CONTENT_DEFAULT_COL_SIZES, CONTENT_DEFAULT_SIZE, CONTENT_DEFAULT_THEME, DEFAULT_PAGE, DEFAULT_ROWS_PER_PAGE, } from '../blocks/constants';
 import { Keyset, i18 } from '../i18n';
 export function getAbsolutePath(router, url) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/blog-constructor",
-  "version": "4.0.0-alpha.0",
+  "version": "4.0.0",
   "description": "Gravity UI Blog Constructor",
   "license": "MIT",
   "repository": {
@@ -73,7 +73,7 @@
     "@commitlint/config-conventional": "^17.4.3",
     "@doc-tools/transform": "^2.9.0",
     "@gravity-ui/eslint-config": "^2.0.0",
-    "@gravity-ui/page-constructor": "^3.0.0-alpha.5",
+    "@gravity-ui/page-constructor": "^3.1.1",
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/stylelint-config": "^1.0.0",
     "@gravity-ui/tsconfig": "^1.0.0",
@@ -141,8 +141,5 @@
     "*.{json,yaml,yml,md}": [
       "prettier --write"
     ]
-  },
-  "publishConfig": {
-    "tag": "alpha"
   }
 }

package/server/data/sanitizeMeta.d.ts

@@ -1,6 +1,8 @@
 import { PostMetaProps } from '../models/common';
 /**
  * Function for sanitized meta-data fields
+ * @param metaData PostMetaProps
+ * @returns metaData
  */
 export declare const sanitizeMeta: (metaData: PostMetaProps) => {
     title: string;

package/server/data/sanitizeMeta.js

@@ -4,6 +4,8 @@ exports.sanitizeMeta = void 0;
 const server_1 = require("@gravity-ui/page-constructor/server");
 /**
  * Function for sanitized meta-data fields
+ * @param metaData PostMetaProps
+ * @returns metaData
  */
 const sanitizeMeta = (metaData) => {
     const { title, description, date, image, canonicalUrl, organization } = metaData;

package/server/data/transformPageContent.js

@@ -4,8 +4,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPageContent = void 0;
-const js_yaml_1 = __importDefault(require("js-yaml"));
 const server_1 = require("@gravity-ui/page-constructor/server");
+const js_yaml_1 = __importDefault(require("js-yaml"));
 const config_1 = require("./config");
 const contentFilter_1 = require("./contentFilter");
 const transformer = ({ blocks, lang, typographyConfig }) => (0, server_1.contentTransformer)({

package/server/models/common.d.ts

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
-import { IBrowser, IDevice } from 'ua-parser-js';
 import { HeaderBlockProps as PageConstructorHeaderBlockProps } from '@gravity-ui/page-constructor';
+import { IBrowser, IDevice } from 'ua-parser-js';
 import { Locale } from '../models/locale';
 export declare enum Theme {
     Light = "light",
@@ -161,3 +161,7 @@ export declare enum DefaultEventNames {
     Service = "selector-service-click",
     SaveOnly = "save-only-button-click"
 }
+export type FetchArgs = {
+    page?: number;
+    query: Query;
+};

package/build/cjs/blocks/YFM/__tests__/YFM.test.d.ts

@@ -1 +0,0 @@
-export {};

package/build/cjs/blocks/YFM/__tests__/YFM.test.js

@@ -1,16 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const react_1 = __importDefault(require("react"));
-const react_2 = require("@testing-library/react");
-const YFM_1 = require("../YFM");
-const text = 'YFM block';
-describe('YFM', () => {
-    test('Has id', async () => {
-        (0, react_2.render)(react_1.default.createElement(YFM_1.YFM, { text: text }));
-        const yfm = react_2.screen.getByText(text);
-        expect(yfm).toHaveClass('yfm');
-    });
-});

package/build/esm/blocks/YFM/__tests__/YFM.test.d.ts

@@ -1 +0,0 @@
-export {};

package/build/esm/blocks/YFM/__tests__/YFM.test.js

@@ -1,11 +0,0 @@
-import React from 'react';
-import { render, screen } from '@testing-library/react';
-import { YFM } from '../YFM';
-const text = 'YFM block';
-describe('YFM', () => {
-    test('Has id', async () => {
-        render(React.createElement(YFM, { text: text }));
-        const yfm = screen.getByText(text);
-        expect(yfm).toHaveClass('yfm');
-    });
-});