@gravity-ui/blog-constructor 3.4.1 → 4.0.0-alpha.1

package/CHANGELOG.md

@@ -1,19 +1,5 @@
 # Changelog
 
-## [3.4.1](https://github.com/gravity-ui/blog-constructor/compare/v3.4.0...v3.4.1) (2023-05-30)
-
-
-### Bug Fixes
-
-* return js, jsx files to gulpfile.js ([#58](https://github.com/gravity-ui/blog-constructor/issues/58)) ([d5e4c42](https://github.com/gravity-ui/blog-constructor/commit/d5e4c428e8eae56fd7ab381c2969c04955adc45b))
-
-## [3.4.0](https://github.com/gravity-ui/blog-constructor/compare/v3.3.0...v3.4.0) (2023-05-24)
-
-
-### Features
-
-* new loading UI (shimmer) ([#50](https://github.com/gravity-ui/blog-constructor/issues/50)) ([ccdf08c](https://github.com/gravity-ui/blog-constructor/commit/ccdf08ccc62dd9930ab8c994601c787b03897f05))
-
 ## [3.3.0](https://github.com/gravity-ui/blog-constructor/compare/v3.2.1...v3.3.0) (2023-05-16)
 
 

package/build/cjs/blocks/Feed/Feed.js

@@ -56,10 +56,11 @@ const Feed = ({ image }) => {
     const { posts, totalCount, tags, services, pinnedPost, getPosts, pageCountForShowSupportButtons, } = (0, react_1.useContext)(FeedContext_1.FeedContext);
     const router = (0, react_1.useContext)(RouterContext_1.RouterContext);
     const handleAnalytics = (0, page_constructor_1.useAnalytics)(common_1.DefaultEventNames.ShowMore);
-    const [{ errorLoad, errorShowMore, isFetching, isShowMoreVisible, lastLoadedCount, postCountOnPage, postsOnPage, pinnedPostOnPage, currentPage, queryParams, }, dispatch,] = (0, react_1.useReducer)(reducer_1.reducer, {
+    const [{ errorLoad, errorShowMore, isFetching, isShowMoreFetching, isShowMoreVisible, lastLoadedCount, postCountOnPage, postsOnPage, pinnedPostOnPage, currentPage, queryParams, }, dispatch,] = (0, react_1.useReducer)(reducer_1.reducer, {
         errorLoad: false,
         errorShowMore: false,
         isFetching: false,
+        isShowMoreFetching: false,
         isShowMoreVisible: true,
         lastLoadedCount: (posts === null || posts === void 0 ? void 0 : posts.length) || 0,
         postCountOnPage: totalCount || 0,
@@ -74,36 +75,36 @@ const Feed = ({ image }) => {
     const pageChange = (value) => {
         dispatch({ type: reducer_1.ActionTypes.PageChange, payload: value });
     };
-    const setIsFetching = (value) => {
-        dispatch({ type: reducer_1.ActionTypes.SetIsFetching, payload: value });
-    };
-    const setErrorLoad = (value) => {
-        dispatch({ type: reducer_1.ActionTypes.SetErrorLoad, payload: value });
-    };
-    const handleChangeQueryParams = (0, react_1.useCallback)((value) => {
+    const handleChangeQueryParams = (value) => {
         dispatch({ type: reducer_1.ActionTypes.QueryParamsChange, payload: value });
         const hasFirstPageQuery = Object.keys(value).some((queryKey) => queryKey === PAGE_QUERY && value[queryKey] === FIRST_PAGE);
-        const result = hasFirstPageQuery
-            ? Object.assign(Object.assign({}, value), { [PAGE_QUERY]: null }) : Object.assign({}, value);
-        router.updateQueryCallback(result);
-    }, [router]);
-    const fetchData = (0, react_1.useCallback)(async ({ page, query }) => {
-        if (query && getPosts) {
-            const queryParamsForRequest = (0, common_2.getFeedQueryParams)(Object.assign(Object.assign({}, queryParams), query), page);
-            const data = await getPosts(queryParamsForRequest);
+        if (hasFirstPageQuery) {
+            // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign
+            value[PAGE_QUERY] = null;
+        }
+        router.updateQueryCallback(value);
+    };
+    const handlePageChange = async (value) => {
+        pageChange(value);
+        handleChangeQueryParams({ page: value });
+    };
+    const fetchData = (0, react_1.useCallback)(async (pageNumber) => {
+        if (queryParams && getPosts) {
+            const query = (0, common_2.getFeedQueryParams)(queryParams, pageNumber);
+            const data = await getPosts(query);
             return data;
         }
         else {
             throw new Error('cant get request');
         }
     }, [getPosts, queryParams]);
-    const handleLoad = (0, react_1.useCallback)(async ({ page, query }) => {
-        const pageNumber = Number(page || queryParams.page || constants_2.DEFAULT_PAGE);
-        handleChangeQueryParams(query);
+    const setIsFetching = (value) => {
+        dispatch({ type: reducer_1.ActionTypes.SetIsFetching, payload: value });
+    };
+    const fetchAndReplaceData = (0, react_1.useCallback)(async (pageNumber) => {
         try {
-            setErrorLoad(false);
-            setIsFetching(true);
-            const fetchedData = await fetchData({ page: pageNumber, query });
+            dispatch({ type: reducer_1.ActionTypes.SetErrorLoad, payload: false });
+            const fetchedData = await fetchData(pageNumber);
             if (fetchedData) {
                 dispatch({
                     type: reducer_1.ActionTypes.SetPosts,
@@ -117,35 +118,22 @@ const Feed = ({ image }) => {
             }
         }
         catch (err) {
-            setErrorLoad(true);
+            dispatch({ type: reducer_1.ActionTypes.SetErrorLoad, payload: true });
         }
         (0, common_2.scrollOnPageChange)(CONTAINER_ID);
         setIsFetching(false);
-    }, [fetchData, handleChangeQueryParams, queryParams]);
-    const handlePageChange = async (value) => {
-        pageChange(value);
-        handleLoad({
-            page: value,
-            query: Object.assign(Object.assign({}, queryParams), { page: value }),
-        });
-    };
+    }, [fetchData]);
     const handleShowMore = async () => {
+        dispatch({ type: reducer_1.ActionTypes.SetIsShowMoreFetching, payload: true });
         /**
          * @deprecated Metrika will be deleted after launch of analyticsEvents
          */
         metrika_js_1.default.reachGoal(utils_1.MetrikaCounter.CrossSite, constants_1.BlogMetrikaGoalIds.showMore);
         handleAnalytics();
-        const nextPage = currentPage + 1;
         try {
-            setIsFetching(true);
-            const fetchedData = await fetchData({
-                page: nextPage,
-                query: {
-                    page: nextPage,
-                },
-            });
+            const fetchedData = await fetchData(currentPage + 1);
             handleChangeQueryParams({
-                page: nextPage,
+                page: currentPage + 1,
             });
             if (fetchedData) {
                 dispatch({
@@ -153,7 +141,7 @@ const Feed = ({ image }) => {
                     payload: {
                         posts: (postsOnPage !== null && postsOnPage !== void 0 ? postsOnPage : []).concat(fetchedData.posts),
                         count: fetchedData.count,
-                        currentPage: nextPage,
+                        currentPage: currentPage + 1,
                         lastLoadedCount: fetchedData.posts.length,
                     },
                 });
@@ -162,11 +150,13 @@ const Feed = ({ image }) => {
         catch (err) {
             dispatch({ type: reducer_1.ActionTypes.SetErrorShowMore, payload: true });
         }
-        setIsFetching(false);
+        dispatch({ type: reducer_1.ActionTypes.SetIsShowMoreFetching, payload: false });
     };
-    const handleOnErrorReload = (0, react_1.useCallback)(() => {
-        handleLoad({ page: currentPage, query: queryParams });
-    }, [currentPage, handleLoad, queryParams]);
+    (0, react_1.useEffect)(() => {
+        if (isFetching) {
+            fetchAndReplaceData(Number(queryParams.page || constants_2.DEFAULT_PAGE));
+        }
+    }, [fetchAndReplaceData, isFetching, queryParams.page]);
     (0, react_1.useEffect)(() => {
         const loadedPostsCount = currentPage * perPageInQuery;
         dispatch({
@@ -184,11 +174,11 @@ const Feed = ({ image }) => {
         icon: tag.icon && react_1.default.createElement(uikit_1.Icon, { data: tag.icon }),
     })), [tags]);
     return (react_1.default.createElement("div", null,
-        react_1.default.createElement(FeedHeader_1.FeedHeader, { verticalOffset: "s", tags: tagItems, services: serviceItems, handleLoadData: handleLoad, queryParams: queryParams, background: {
+        react_1.default.createElement(FeedHeader_1.FeedHeader, { verticalOffset: "s", tags: tagItems, services: serviceItems, setIsFetching: setIsFetching, handleChangeQuery: handleChangeQueryParams, queryParams: queryParams, background: {
                 fullWidth: true,
                 url: image,
                 disableCompress: true,
             } }),
-        errorLoad ? (react_1.default.createElement(PostsError_1.PostsError, { onButtonClick: handleOnErrorReload })) : (react_1.default.createElement(Posts_1.Posts, { containerId: CONTAINER_ID, currentPage: currentPage, isShowMoreVisible: isShowMoreVisible, errorShowMore: errorShowMore, postCountOnPage: postCountOnPage, perPageInQuery: perPageInQuery, handleShowMore: handleShowMore, handlePageChange: handlePageChange, postsOnPage: postsOnPage, pinnedPostOnPage: pinnedPostOnPage, isFetching: isFetching, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))));
+        errorLoad ? (react_1.default.createElement(PostsError_1.PostsError, { onButtonClick: () => fetchAndReplaceData(Number(queryParams.page || constants_2.DEFAULT_PAGE)) })) : (react_1.default.createElement(Posts_1.Posts, { containerId: CONTAINER_ID, currentPage: currentPage, isShowMoreVisible: isShowMoreVisible, errorShowMore: errorShowMore, postCountOnPage: postCountOnPage, perPageInQuery: perPageInQuery, handleShowMore: handleShowMore, handlePageChange: handlePageChange, postsOnPage: postsOnPage, pinnedPostOnPage: pinnedPostOnPage, isFetching: isFetching, isShowMoreFetching: isShowMoreFetching, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))));
 };
 exports.Feed = Feed;

package/build/cjs/blocks/Feed/reducer.d.ts

@@ -6,6 +6,7 @@ export declare enum ActionTypes {
     SetPosts = "setPosts",
     SetShowMore = "setShowMore",
     SetIsFetching = "setIsFetching",
+    SetIsShowMoreFetching = "setIsShowMoreFetching",
     PageChange = "pageChange",
     QueryParamsChange = "queryParamsChange"
 }
@@ -14,6 +15,7 @@ export type State = {
     errorLoad: boolean;
     errorShowMore: boolean;
     isFetching: boolean;
+    isShowMoreFetching: boolean;
     isShowMoreVisible: boolean;
     lastLoadedCount: number;
     pinnedPostOnPage?: PostData;
@@ -27,6 +29,9 @@ type Action = {
 } | {
     type: ActionTypes.SetIsFetching;
     payload: boolean;
+} | {
+    type: ActionTypes.SetIsShowMoreFetching;
+    payload: boolean;
 } | {
     type: ActionTypes.SetPosts;
     payload: {

package/build/cjs/blocks/Feed/reducer.js

@@ -9,6 +9,7 @@ var ActionTypes;
     ActionTypes["SetPosts"] = "setPosts";
     ActionTypes["SetShowMore"] = "setShowMore";
     ActionTypes["SetIsFetching"] = "setIsFetching";
+    ActionTypes["SetIsShowMoreFetching"] = "setIsShowMoreFetching";
     ActionTypes["PageChange"] = "pageChange";
     ActionTypes["QueryParamsChange"] = "queryParamsChange";
 })(ActionTypes = exports.ActionTypes || (exports.ActionTypes = {}));
@@ -19,9 +20,11 @@ const reducer = (state, { type, payload }) => {
         case ActionTypes.SetPosts:
             return Object.assign(Object.assign({}, state), { lastLoadedCount: payload.count, postCountOnPage: payload.count, pinnedPostOnPage: payload.pinnedPost, postsOnPage: payload.posts, currentPage: payload.page });
         case ActionTypes.SetShowMore:
-            return Object.assign(Object.assign({}, state), { lastLoadedCount: payload.lastLoadedCount, postCountOnPage: payload.count, currentPage: payload.currentPage, postsOnPage: payload.posts, errorShowMore: false });
+            return Object.assign(Object.assign({}, state), { lastLoadedCount: payload.lastLoadedCount, postCountOnPage: payload.count, currentPage: payload.currentPage, postsOnPage: payload.posts, errorShowMore: false, isShowMoreFetching: true });
         case ActionTypes.SetIsFetching:
             return Object.assign(Object.assign({}, state), { isFetching: payload });
+        case ActionTypes.SetIsShowMoreFetching:
+            return Object.assign(Object.assign({}, state), { isShowMoreFetching: payload });
         case ActionTypes.PageChange:
             return Object.assign(Object.assign({}, state), { currentPage: payload, isFetching: true });
         case ActionTypes.SetErrorLoad:

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

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.YFM = void 0;
 const react_1 = __importDefault(require("react"));
-const page_constructor_1 = require("@gravity-ui/page-constructor");
 const bem_cn_lite_1 = __importDefault(require("bem-cn-lite"));
+const page_constructor_1 = require("@gravity-ui/page-constructor");
 const Wrapper_1 = require("../../components/Wrapper/Wrapper");
 const paddings_1 = require("../../models/paddings");
 const b = (0, bem_cn_lite_1.default)('yfm');

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

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

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

@@ -0,0 +1,16 @@
+"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/cjs/components/FeedHeader/FeedHeader.js

@@ -9,7 +9,7 @@ const page_constructor_1 = require("@gravity-ui/page-constructor");
 const cn_1 = require("../../utils/cn");
 const Controls_1 = require("./components/Controls/Controls");
 const b = (0, cn_1.block)('feed-header');
-const FeedHeader = ({ tags, services, handleLoadData, offset = 'default', background, theme = 'default', verticalOffset = 'l', className, queryParams, }) => {
+const FeedHeader = ({ tags, services, setIsFetching, offset = 'default', background, theme = 'default', verticalOffset = 'l', className, handleChangeQuery, queryParams, }) => {
     const backgroundThemed = background && (0, page_constructor_1.getThemedValue)(background, theme);
     return (react_1.default.createElement("header", { className: b('header', { ['has-background']: Boolean(background) }, className) },
         (backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.color) ? (react_1.default.createElement(page_constructor_1.FullWidthBackground, { style: { backgroundColor: backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.color }, theme: "rounded" })) : null,
@@ -19,6 +19,6 @@ const FeedHeader = ({ tags, services, handleLoadData, offset = 'default', backgr
                         ? ''
                         : backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.color,
                 }, disableCompress: backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.disableCompress })) : null,
-            react_1.default.createElement(Controls_1.Controls, { tags: tags, services: services, handleLoadData: handleLoadData, queryParams: queryParams }))));
+            react_1.default.createElement(Controls_1.Controls, { tags: tags, services: services, setIsFetching: setIsFetching, handleChangeQuery: handleChangeQuery, queryParams: queryParams }))));
 };
 exports.FeedHeader = FeedHeader;

package/build/cjs/components/FeedHeader/components/Controls/Controls.d.ts

@@ -1,14 +1,15 @@
 import React, { ReactNode } from 'react';
-import { FetchArgs, Query, SetQueryType } from '../../../../models/common';
+import { HandleChangeQueryParams, Query, SetQueryType } from '../../../../models/common';
 export type SelectItem = {
     content: string;
     value: string;
     icon?: ReactNode;
 };
 export type ControlsProps = {
-    handleLoadData: (props: FetchArgs) => void;
+    setIsFetching: (value: boolean) => void;
     tags?: SelectItem[];
     services?: SelectItem[];
+    handleChangeQuery: HandleChangeQueryParams;
     queryParams: Query;
     setQuery?: SetQueryType;
 };

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

@@ -47,7 +47,7 @@ const b = (0, cn_1.block)('feed-controls');
 const ICON_SIZE = 16;
 const DEFAULT_PAGE = 1;
 const VIRTUALIZATION_THRESHOLD = 1000;
-const Controls = ({ handleLoadData, tags = [], services = [], queryParams, }) => {
+const Controls = ({ setIsFetching, tags = [], services = [], handleChangeQuery, queryParams, }) => {
     const { hasLikes } = (0, react_1.useContext)(LikesContext_1.LikesContext);
     const handleAnalyticsTag = (0, page_constructor_1.useAnalytics)(common_1.DefaultEventNames.Tag);
     const handleAnalyticsService = (0, page_constructor_1.useAnalytics)(common_1.DefaultEventNames.Service);
@@ -56,25 +56,21 @@ const Controls = ({ handleLoadData, tags = [], services = [], queryParams, }) =>
     const [savedOnly, setSavedOnly] = (0, react_1.useState)(savedOnlyInitial === 'true');
     const [search, setSearch] = (0, react_1.useState)(searchInitial);
     const handleSavedOnly = () => {
-        handleAnalyticsSaveOnly();
-        setSavedOnly(!savedOnly);
-        handleLoadData({
+        handleChangeQuery({
+            savedOnly: savedOnly ? '' : 'true',
+            search: '',
+            tags: '',
             page: DEFAULT_PAGE,
-            query: {
-                savedOnly: savedOnly ? '' : 'true',
-                search: '',
-                tags: '',
-                page: DEFAULT_PAGE,
-                services: '',
-            },
+            services: '',
         });
+        handleAnalyticsSaveOnly();
+        setSavedOnly(!savedOnly);
+        setIsFetching(true);
     };
     const handleSearch = (searchValue) => {
+        handleChangeQuery({ search: searchValue, page: DEFAULT_PAGE });
         setSearch(searchValue);
-        handleLoadData({
-            page: DEFAULT_PAGE,
-            query: { search: searchValue, page: DEFAULT_PAGE },
-        });
+        setIsFetching(true);
     };
     const handleTagSelect = (selectedTags) => {
         /**
@@ -87,13 +83,11 @@ const Controls = ({ handleLoadData, tags = [], services = [], queryParams, }) =>
             theme: selectedTags[0],
         });
         const isEmptyTag = selectedTags.some((tag) => tag === 'empty');
-        handleLoadData({
+        handleChangeQuery({
+            tags: isEmptyTag ? '' : selectedTags[0],
             page: DEFAULT_PAGE,
-            query: {
-                tags: isEmptyTag ? '' : selectedTags[0],
-                page: DEFAULT_PAGE,
-            },
         });
+        setIsFetching(true);
     };
     const handleServicesSelect = (selectedServices) => {
         const forMetrikaServices = services.filter((service) => {
@@ -110,10 +104,8 @@ const Controls = ({ handleLoadData, tags = [], services = [], queryParams, }) =>
             service: metrikaAsString,
         });
         const servicesAsString = selectedServices.join(',');
-        handleLoadData({
-            page: DEFAULT_PAGE,
-            query: { services: servicesAsString, page: DEFAULT_PAGE },
-        });
+        handleChangeQuery({ services: servicesAsString, page: DEFAULT_PAGE });
+        setIsFetching(true);
     };
     const tagsItems = (0, react_1.useMemo)(() => [{ value: 'empty', content: (0, i18n_1.i18)(i18n_1.Keyset.AllTags) }, ...tags], [tags]);
     const servicesItems = (0, react_1.useMemo)(() => (servicesInitial ? [...servicesInitial.split(',')] : []), [servicesInitial]);

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

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

package/build/cjs/components/Paginator/Paginator.js

@@ -54,7 +54,7 @@ const types_1 = require("./types");
 const utils_2 = require("./utils");
 const b = (0, cn_1.block)('paginator');
 const DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS = 6;
-const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className, onPageChange, pageCountForShowSupportButtons = DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS, }) => {
+const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className, loading, onPageChange, pageCountForShowSupportButtons = DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS, }) => {
     const [pagesCount, setPagesCount] = (0, react_1.useState)((0, utils_2.getPagesCount)({ itemsPerPage, totalItems, maxPages }));
     (0, react_1.useEffect)(() => {
         const count = (0, utils_2.getPagesCount)({ itemsPerPage, totalItems, maxPages });
@@ -123,7 +123,7 @@ const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className, onPage
     }
     const renderPaginatorItem = (item) => {
         const { key } = item, rest = __rest(item, ["key"]);
-        return react_1.default.createElement(PaginatorItem_1.PaginatorItem, Object.assign({ key: `page_${key}` }, rest));
+        return react_1.default.createElement(PaginatorItem_1.PaginatorItem, Object.assign({ key: `page_${key}` }, rest, { loading: loading }));
     };
     return (react_1.default.createElement("div", { className: b('pagination') },
         page > 1 && (react_1.default.createElement("div", { className: b('pagination-block') },

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

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

package/build/cjs/components/Posts/Posts.css

@@ -1,15 +1,9 @@
 /* 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;
@@ -31,23 +25,4 @@ 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/cjs/components/Posts/Posts.d.ts

@@ -8,6 +8,7 @@ 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/cjs/components/Posts/Posts.js

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

package/build/cjs/components/Search/Search.js

@@ -25,8 +25,8 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Search = void 0;
 const react_1 = __importStar(require("react"));
-const uikit_1 = require("@gravity-ui/uikit");
 const lodash_1 = require("lodash");
+const uikit_1 = require("@gravity-ui/uikit");
 const useIsIPhone_1 = require("../../hooks/useIsIPhone");
 const i18n_1 = require("../../i18n");
 const Close_1 = require("../../icons/Close");

package/build/cjs/containers/BlogPostPage/BlogPostPage.css

@@ -173,18 +173,6 @@ unpredictable css rules order in build */
 .yfm_constructor_theme_dark p {
   color: var(--yc-color-text-light-primary);
 }
-.yfm_constructor_footnote_text p, .yfm_constructor_footnote_page p {
-  opacity: 0.5;
-}
-.yfm_constructor_footnote_text p {
-  font-size: var(--yc-text-body-2-font-size);
-  line-height: var(--yc-text-body-2-line-height);
-}
-.yfm_constructor_footnote_page p {
-  font-size: var(--yc-text-body-1-font-size);
-  line-height: var(--yc-text-body-1-line-height);
-  display: inline;
-}
 .yfm_constructor_list_style ul {
   padding-left: 20px;
 }

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

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

package/build/cjs/utils/common.d.ts

@@ -23,7 +23,7 @@ export declare const updateContentSizes: ({ size, colSizes, theme, ...contentDat
         md: number;
     } | Partial<Record<import("@gravity-ui/page-constructor").GridColumnSize, number>>;
     theme: import("@gravity-ui/page-constructor").ContentTheme;
-    title?: string | import("@gravity-ui/page-constructor").TitleBaseProps | undefined;
+    title?: string | import("@gravity-ui/page-constructor").TitleItemBaseProps | undefined;
     text?: string | undefined;
     additionalInfo?: string | undefined;
     links?: import("@gravity-ui/page-constructor").LinkProps[] | undefined;

package/build/cjs/utils/common.js

@@ -13,8 +13,8 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.scrollOnPageChange = exports.getFeedQueryParams = exports.getBlogElementMetrika = exports.isMetrikaExist = exports.getBreadcrumbs = exports.getBlogPath = exports.updateContentSizes = exports.getTagFilterUrl = exports.postLikeStatus = exports.getTags = exports.scrollToHash = exports.getPageSearchParams = exports.getAbsolutePath = void 0;
 const url_1 = require("url");
-const page_constructor_1 = require("@gravity-ui/page-constructor");
 const lodash_1 = require("lodash");
+const page_constructor_1 = require("@gravity-ui/page-constructor");
 const constants_1 = require("../blocks/constants");
 const i18n_1 = require("../i18n");
 function getAbsolutePath(router, url) {

package/build/esm/blocks/Feed/Feed.js

@@ -27,10 +27,11 @@ export const Feed = ({ image }) => {
     const { posts, totalCount, tags, services, pinnedPost, getPosts, pageCountForShowSupportButtons, } = useContext(FeedContext);
     const router = useContext(RouterContext);
     const handleAnalytics = useAnalytics(DefaultEventNames.ShowMore);
-    const [{ errorLoad, errorShowMore, isFetching, isShowMoreVisible, lastLoadedCount, postCountOnPage, postsOnPage, pinnedPostOnPage, currentPage, queryParams, }, dispatch,] = useReducer(reducer, {
+    const [{ errorLoad, errorShowMore, isFetching, isShowMoreFetching, isShowMoreVisible, lastLoadedCount, postCountOnPage, postsOnPage, pinnedPostOnPage, currentPage, queryParams, }, dispatch,] = useReducer(reducer, {
         errorLoad: false,
         errorShowMore: false,
         isFetching: false,
+        isShowMoreFetching: false,
         isShowMoreVisible: true,
         lastLoadedCount: (posts === null || posts === void 0 ? void 0 : posts.length) || 0,
         postCountOnPage: totalCount || 0,
@@ -45,36 +46,36 @@ export const Feed = ({ image }) => {
     const pageChange = (value) => {
         dispatch({ type: ActionTypes.PageChange, payload: value });
     };
-    const setIsFetching = (value) => {
-        dispatch({ type: ActionTypes.SetIsFetching, payload: value });
-    };
-    const setErrorLoad = (value) => {
-        dispatch({ type: ActionTypes.SetErrorLoad, payload: value });
-    };
-    const handleChangeQueryParams = useCallback((value) => {
+    const handleChangeQueryParams = (value) => {
         dispatch({ type: ActionTypes.QueryParamsChange, payload: value });
         const hasFirstPageQuery = Object.keys(value).some((queryKey) => queryKey === PAGE_QUERY && value[queryKey] === FIRST_PAGE);
-        const result = hasFirstPageQuery
-            ? Object.assign(Object.assign({}, value), { [PAGE_QUERY]: null }) : Object.assign({}, value);
-        router.updateQueryCallback(result);
-    }, [router]);
-    const fetchData = useCallback(async ({ page, query }) => {
-        if (query && getPosts) {
-            const queryParamsForRequest = getFeedQueryParams(Object.assign(Object.assign({}, queryParams), query), page);
-            const data = await getPosts(queryParamsForRequest);
+        if (hasFirstPageQuery) {
+            // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign
+            value[PAGE_QUERY] = null;
+        }
+        router.updateQueryCallback(value);
+    };
+    const handlePageChange = async (value) => {
+        pageChange(value);
+        handleChangeQueryParams({ page: value });
+    };
+    const fetchData = useCallback(async (pageNumber) => {
+        if (queryParams && getPosts) {
+            const query = getFeedQueryParams(queryParams, pageNumber);
+            const data = await getPosts(query);
             return data;
         }
         else {
             throw new Error('cant get request');
         }
     }, [getPosts, queryParams]);
-    const handleLoad = useCallback(async ({ page, query }) => {
-        const pageNumber = Number(page || queryParams.page || DEFAULT_PAGE);
-        handleChangeQueryParams(query);
+    const setIsFetching = (value) => {
+        dispatch({ type: ActionTypes.SetIsFetching, payload: value });
+    };
+    const fetchAndReplaceData = useCallback(async (pageNumber) => {
         try {
-            setErrorLoad(false);
-            setIsFetching(true);
-            const fetchedData = await fetchData({ page: pageNumber, query });
+            dispatch({ type: ActionTypes.SetErrorLoad, payload: false });
+            const fetchedData = await fetchData(pageNumber);
             if (fetchedData) {
                 dispatch({
                     type: ActionTypes.SetPosts,
@@ -88,35 +89,22 @@ export const Feed = ({ image }) => {
             }
         }
         catch (err) {
-            setErrorLoad(true);
+            dispatch({ type: ActionTypes.SetErrorLoad, payload: true });
         }
         scrollOnPageChange(CONTAINER_ID);
         setIsFetching(false);
-    }, [fetchData, handleChangeQueryParams, queryParams]);
-    const handlePageChange = async (value) => {
-        pageChange(value);
-        handleLoad({
-            page: value,
-            query: Object.assign(Object.assign({}, queryParams), { page: value }),
-        });
-    };
+    }, [fetchData]);
     const handleShowMore = async () => {
+        dispatch({ type: ActionTypes.SetIsShowMoreFetching, payload: true });
         /**
          * @deprecated Metrika will be deleted after launch of analyticsEvents
          */
         metrika.reachGoal(MetrikaCounter.CrossSite, BlogMetrikaGoalIds.showMore);
         handleAnalytics();
-        const nextPage = currentPage + 1;
         try {
-            setIsFetching(true);
-            const fetchedData = await fetchData({
-                page: nextPage,
-                query: {
-                    page: nextPage,
-                },
-            });
+            const fetchedData = await fetchData(currentPage + 1);
             handleChangeQueryParams({
-                page: nextPage,
+                page: currentPage + 1,
             });
             if (fetchedData) {
                 dispatch({
@@ -124,7 +112,7 @@ export const Feed = ({ image }) => {
                     payload: {
                         posts: (postsOnPage !== null && postsOnPage !== void 0 ? postsOnPage : []).concat(fetchedData.posts),
                         count: fetchedData.count,
-                        currentPage: nextPage,
+                        currentPage: currentPage + 1,
                         lastLoadedCount: fetchedData.posts.length,
                     },
                 });
@@ -133,11 +121,13 @@ export const Feed = ({ image }) => {
         catch (err) {
             dispatch({ type: ActionTypes.SetErrorShowMore, payload: true });
         }
-        setIsFetching(false);
+        dispatch({ type: ActionTypes.SetIsShowMoreFetching, payload: false });
     };
-    const handleOnErrorReload = useCallback(() => {
-        handleLoad({ page: currentPage, query: queryParams });
-    }, [currentPage, handleLoad, queryParams]);
+    useEffect(() => {
+        if (isFetching) {
+            fetchAndReplaceData(Number(queryParams.page || DEFAULT_PAGE));
+        }
+    }, [fetchAndReplaceData, isFetching, queryParams.page]);
     useEffect(() => {
         const loadedPostsCount = currentPage * perPageInQuery;
         dispatch({
@@ -155,10 +145,10 @@ export const Feed = ({ image }) => {
         icon: tag.icon && React.createElement(Icon, { data: tag.icon }),
     })), [tags]);
     return (React.createElement("div", null,
-        React.createElement(FeedHeader, { verticalOffset: "s", tags: tagItems, services: serviceItems, handleLoadData: handleLoad, queryParams: queryParams, background: {
+        React.createElement(FeedHeader, { verticalOffset: "s", tags: tagItems, services: serviceItems, setIsFetching: setIsFetching, handleChangeQuery: handleChangeQueryParams, queryParams: queryParams, background: {
                 fullWidth: true,
                 url: image,
                 disableCompress: true,
             } }),
-        errorLoad ? (React.createElement(PostsError, { onButtonClick: handleOnErrorReload })) : (React.createElement(Posts, { containerId: CONTAINER_ID, currentPage: currentPage, isShowMoreVisible: isShowMoreVisible, errorShowMore: errorShowMore, postCountOnPage: postCountOnPage, perPageInQuery: perPageInQuery, handleShowMore: handleShowMore, handlePageChange: handlePageChange, postsOnPage: postsOnPage, pinnedPostOnPage: pinnedPostOnPage, isFetching: isFetching, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))));
+        errorLoad ? (React.createElement(PostsError, { onButtonClick: () => fetchAndReplaceData(Number(queryParams.page || DEFAULT_PAGE)) })) : (React.createElement(Posts, { containerId: CONTAINER_ID, currentPage: currentPage, isShowMoreVisible: isShowMoreVisible, errorShowMore: errorShowMore, postCountOnPage: postCountOnPage, perPageInQuery: perPageInQuery, handleShowMore: handleShowMore, handlePageChange: handlePageChange, postsOnPage: postsOnPage, pinnedPostOnPage: pinnedPostOnPage, isFetching: isFetching, isShowMoreFetching: isShowMoreFetching, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))));
 };

package/build/esm/blocks/Feed/reducer.d.ts

@@ -6,6 +6,7 @@ export declare enum ActionTypes {
     SetPosts = "setPosts",
     SetShowMore = "setShowMore",
     SetIsFetching = "setIsFetching",
+    SetIsShowMoreFetching = "setIsShowMoreFetching",
     PageChange = "pageChange",
     QueryParamsChange = "queryParamsChange"
 }
@@ -14,6 +15,7 @@ export type State = {
     errorLoad: boolean;
     errorShowMore: boolean;
     isFetching: boolean;
+    isShowMoreFetching: boolean;
     isShowMoreVisible: boolean;
     lastLoadedCount: number;
     pinnedPostOnPage?: PostData;
@@ -27,6 +29,9 @@ type Action = {
 } | {
     type: ActionTypes.SetIsFetching;
     payload: boolean;
+} | {
+    type: ActionTypes.SetIsShowMoreFetching;
+    payload: boolean;
 } | {
     type: ActionTypes.SetPosts;
     payload: {

package/build/esm/blocks/Feed/reducer.js

@@ -6,6 +6,7 @@ export var ActionTypes;
     ActionTypes["SetPosts"] = "setPosts";
     ActionTypes["SetShowMore"] = "setShowMore";
     ActionTypes["SetIsFetching"] = "setIsFetching";
+    ActionTypes["SetIsShowMoreFetching"] = "setIsShowMoreFetching";
     ActionTypes["PageChange"] = "pageChange";
     ActionTypes["QueryParamsChange"] = "queryParamsChange";
 })(ActionTypes || (ActionTypes = {}));
@@ -16,9 +17,11 @@ export const reducer = (state, { type, payload }) => {
         case ActionTypes.SetPosts:
             return Object.assign(Object.assign({}, state), { lastLoadedCount: payload.count, postCountOnPage: payload.count, pinnedPostOnPage: payload.pinnedPost, postsOnPage: payload.posts, currentPage: payload.page });
         case ActionTypes.SetShowMore:
-            return Object.assign(Object.assign({}, state), { lastLoadedCount: payload.lastLoadedCount, postCountOnPage: payload.count, currentPage: payload.currentPage, postsOnPage: payload.posts, errorShowMore: false });
+            return Object.assign(Object.assign({}, state), { lastLoadedCount: payload.lastLoadedCount, postCountOnPage: payload.count, currentPage: payload.currentPage, postsOnPage: payload.posts, errorShowMore: false, isShowMoreFetching: true });
         case ActionTypes.SetIsFetching:
             return Object.assign(Object.assign({}, state), { isFetching: payload });
+        case ActionTypes.SetIsShowMoreFetching:
+            return Object.assign(Object.assign({}, state), { isShowMoreFetching: payload });
         case ActionTypes.PageChange:
             return Object.assign(Object.assign({}, state), { currentPage: payload, isFetching: true });
         case ActionTypes.SetErrorLoad:

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

@@ -1,6 +1,6 @@
 import React from 'react';
-import { YFMWrapper } from '@gravity-ui/page-constructor';
 import block from 'bem-cn-lite';
+import { YFMWrapper } from '@gravity-ui/page-constructor';
 import { Wrapper } from '../../components/Wrapper/Wrapper';
 import { PaddingsDirections } from '../../models/paddings';
 const b = block('yfm');

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

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

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

@@ -0,0 +1,11 @@
+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');
+    });
+});

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

@@ -4,7 +4,7 @@ import { block } from '../../utils/cn';
 import { Controls } from './components/Controls/Controls';
 import './FeedHeader.css';
 const b = block('feed-header');
-export const FeedHeader = ({ tags, services, handleLoadData, offset = 'default', background, theme = 'default', verticalOffset = 'l', className, queryParams, }) => {
+export const FeedHeader = ({ tags, services, setIsFetching, offset = 'default', background, theme = 'default', verticalOffset = 'l', className, handleChangeQuery, queryParams, }) => {
     const backgroundThemed = background && getThemedValue(background, theme);
     return (React.createElement("header", { className: b('header', { ['has-background']: Boolean(background) }, className) },
         (backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.color) ? (React.createElement(FullWidthBackground, { style: { backgroundColor: backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.color }, theme: "rounded" })) : null,
@@ -14,5 +14,5 @@ export const FeedHeader = ({ tags, services, handleLoadData, offset = 'default',
                         ? ''
                         : backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.color,
                 }, disableCompress: backgroundThemed === null || backgroundThemed === void 0 ? void 0 : backgroundThemed.disableCompress })) : null,
-            React.createElement(Controls, { tags: tags, services: services, handleLoadData: handleLoadData, queryParams: queryParams }))));
+            React.createElement(Controls, { tags: tags, services: services, setIsFetching: setIsFetching, handleChangeQuery: handleChangeQuery, queryParams: queryParams }))));
 };

package/build/esm/components/FeedHeader/components/Controls/Controls.d.ts

@@ -1,5 +1,5 @@
 import React, { ReactNode } from 'react';
-import { FetchArgs, Query, SetQueryType } from '../../../../models/common';
+import { HandleChangeQueryParams, Query, SetQueryType } from '../../../../models/common';
 import './Controls.css';
 export type SelectItem = {
     content: string;
@@ -7,9 +7,10 @@ export type SelectItem = {
     icon?: ReactNode;
 };
 export type ControlsProps = {
-    handleLoadData: (props: FetchArgs) => void;
+    setIsFetching: (value: boolean) => void;
     tags?: SelectItem[];
     services?: SelectItem[];
+    handleChangeQuery: HandleChangeQueryParams;
     queryParams: Query;
     setQuery?: SetQueryType;
 };

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 = ({ handleLoadData, tags = [], services = [], queryParams, }) => {
+export const Controls = ({ setIsFetching, tags = [], services = [], handleChangeQuery, queryParams, }) => {
     const { hasLikes } = useContext(LikesContext);
     const handleAnalyticsTag = useAnalytics(DefaultEventNames.Tag);
     const handleAnalyticsService = useAnalytics(DefaultEventNames.Service);
@@ -28,25 +28,21 @@ export const Controls = ({ handleLoadData, tags = [], services = [], queryParams
     const [savedOnly, setSavedOnly] = useState(savedOnlyInitial === 'true');
     const [search, setSearch] = useState(searchInitial);
     const handleSavedOnly = () => {
-        handleAnalyticsSaveOnly();
-        setSavedOnly(!savedOnly);
-        handleLoadData({
+        handleChangeQuery({
+            savedOnly: savedOnly ? '' : 'true',
+            search: '',
+            tags: '',
             page: DEFAULT_PAGE,
-            query: {
-                savedOnly: savedOnly ? '' : 'true',
-                search: '',
-                tags: '',
-                page: DEFAULT_PAGE,
-                services: '',
-            },
+            services: '',
         });
+        handleAnalyticsSaveOnly();
+        setSavedOnly(!savedOnly);
+        setIsFetching(true);
     };
     const handleSearch = (searchValue) => {
+        handleChangeQuery({ search: searchValue, page: DEFAULT_PAGE });
         setSearch(searchValue);
-        handleLoadData({
-            page: DEFAULT_PAGE,
-            query: { search: searchValue, page: DEFAULT_PAGE },
-        });
+        setIsFetching(true);
     };
     const handleTagSelect = (selectedTags) => {
         /**
@@ -59,13 +55,11 @@ export const Controls = ({ handleLoadData, tags = [], services = [], queryParams
             theme: selectedTags[0],
         });
         const isEmptyTag = selectedTags.some((tag) => tag === 'empty');
-        handleLoadData({
+        handleChangeQuery({
+            tags: isEmptyTag ? '' : selectedTags[0],
             page: DEFAULT_PAGE,
-            query: {
-                tags: isEmptyTag ? '' : selectedTags[0],
-                page: DEFAULT_PAGE,
-            },
         });
+        setIsFetching(true);
     };
     const handleServicesSelect = (selectedServices) => {
         const forMetrikaServices = services.filter((service) => {
@@ -82,10 +76,8 @@ export const Controls = ({ handleLoadData, tags = [], services = [], queryParams
             service: metrikaAsString,
         });
         const servicesAsString = selectedServices.join(',');
-        handleLoadData({
-            page: DEFAULT_PAGE,
-            query: { services: servicesAsString, page: DEFAULT_PAGE },
-        });
+        handleChangeQuery({ services: servicesAsString, page: DEFAULT_PAGE });
+        setIsFetching(true);
     };
     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, onPageChange, pageCountForShowSupportButtons, }: PaginatorProps) => JSX.Element | null;
+export declare const Paginator: ({ itemsPerPage, totalItems, maxPages, page, className, loading, 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, onPageChange, pageCountForShowSupportButtons = DEFAULT_PAGE_COUNT_FOR_SHOW_SUPPORT_BUTTONS, }) => {
+export const Paginator = ({ itemsPerPage, totalItems, maxPages, page, className, loading, 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));
+        return React.createElement(PaginatorItem, Object.assign({ key: `page_${key}` }, rest, { loading: loading }));
     };
     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,6 +15,7 @@ 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,15 +1,9 @@
 /* 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;
@@ -31,23 +25,4 @@ 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,6 +9,7 @@ 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,9 +8,8 @@ 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, 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 }) },
+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') },
         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: {
@@ -19,9 +18,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 }, 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, loading: isShowMoreFetching }, 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, maxPages: Infinity, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))))));
+            React.createElement(Paginator, { onPageChange: handlePageChange, page: currentPage, totalItems: postCountOnPage, itemsPerPage: perPageInQuery, loading: isFetching, maxPages: Infinity, pageCountForShowSupportButtons: pageCountForShowSupportButtons }))))));

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

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

package/build/esm/containers/BlogPostPage/BlogPostPage.css

@@ -173,18 +173,6 @@ unpredictable css rules order in build */
 .yfm_constructor_theme_dark p {
   color: var(--yc-color-text-light-primary);
 }
-.yfm_constructor_footnote_text p, .yfm_constructor_footnote_page p {
-  opacity: 0.5;
-}
-.yfm_constructor_footnote_text p {
-  font-size: var(--yc-text-body-2-font-size);
-  line-height: var(--yc-text-body-2-line-height);
-}
-.yfm_constructor_footnote_page p {
-  font-size: var(--yc-text-body-1-font-size);
-  line-height: var(--yc-text-body-1-line-height);
-  display: inline;
-}
 .yfm_constructor_list_style ul {
   padding-left: 20px;
 }

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

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

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

@@ -23,7 +23,7 @@ export declare const updateContentSizes: ({ size, colSizes, theme, ...contentDat
         md: number;
     } | Partial<Record<import("@gravity-ui/page-constructor").GridColumnSize, number>>;
     theme: import("@gravity-ui/page-constructor").ContentTheme;
-    title?: string | import("@gravity-ui/page-constructor").TitleBaseProps | undefined;
+    title?: string | import("@gravity-ui/page-constructor").TitleItemBaseProps | undefined;
     text?: string | undefined;
     additionalInfo?: string | undefined;
     links?: import("@gravity-ui/page-constructor").LinkProps[] | undefined;

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 { isNewMetrikaFormat, } from '@gravity-ui/page-constructor';
 import { debounce, memoize } from 'lodash';
+import { isNewMetrikaFormat, } from '@gravity-ui/page-constructor';
 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": "3.4.1",
+  "version": "4.0.0-alpha.1",
   "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": "^2.13.0",
+    "@gravity-ui/page-constructor": "^3.0.0-alpha.6",
     "@gravity-ui/prettier-config": "^1.0.1",
     "@gravity-ui/stylelint-config": "^1.0.0",
     "@gravity-ui/tsconfig": "^1.0.0",
@@ -141,5 +141,8 @@
     "*.{json,yaml,yml,md}": [
       "prettier --write"
     ]
+  },
+  "publishConfig": {
+    "tag": "alpha"
   }
 }

package/server/data/sanitizeMeta.d.ts

@@ -1,8 +1,6 @@
 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,8 +4,6 @@ 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,11 +4,19 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformPageContent = void 0;
-const server_1 = require("@gravity-ui/page-constructor/server");
 const js_yaml_1 = __importDefault(require("js-yaml"));
+const server_1 = require("@gravity-ui/page-constructor/server");
 const config_1 = require("./config");
 const contentFilter_1 = require("./contentFilter");
-const transformBlocks = ({ blocks, lang, typographyConfig }) => (0, server_1.transformBlocks)(blocks, lang, Object.assign(Object.assign({}, typographyConfig), (0, config_1.getExtendTypographyConfig)()));
+const transformer = ({ blocks, lang, typographyConfig }) => (0, server_1.contentTransformer)({
+    content: {
+        blocks: blocks || [],
+    },
+    options: {
+        lang,
+        customConfig: Object.assign(Object.assign({}, typographyConfig), (0, config_1.getExtendTypographyConfig)()),
+    },
+});
 /**
  * Func for transform blog page content
  *
@@ -22,7 +30,12 @@ const transformPageContent = ({ content, lang, region, typographyConfig = {}, })
     try {
         const transformedContent = (0, contentFilter_1.filterContent)(js_yaml_1.default.load(content), { lang, region });
         if (transformedContent.blocks) {
-            transformBlocks({ blocks: transformedContent.blocks, lang, typographyConfig });
+            const { blocks: transformedBlocks } = transformer({
+                blocks: transformedContent.blocks,
+                lang,
+                typographyConfig,
+            });
+            transformedContent.blocks = transformedBlocks;
         }
         return transformedContent;
     }

package/server/models/common.d.ts

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