@gravity-ui/blog-constructor 2.3.0 → 3.0.1

package/CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## [3.0.1](https://github.com/gravity-ui/blog-constructor/compare/v3.0.0...v3.0.1) (2023-04-24)
+
+
+### Bug Fixes
+
+* rewrap pagination item ([#36](https://github.com/gravity-ui/blog-constructor/issues/36)) ([a3a56b2](https://github.com/gravity-ui/blog-constructor/commit/a3a56b2d4519871427de1e42267ce18736f7f7b1))
+
+## [3.0.0](https://github.com/gravity-ui/blog-constructor/compare/v2.3.0...v3.0.0) (2023-04-10)
+
+
+### ⚠ BREAKING CHANGES
+
+* add callback prop for blog page ([#25](https://github.com/gravity-ui/blog-constructor/issues/25))
+
+### Features
+
+* add callback prop for blog page ([#25](https://github.com/gravity-ui/blog-constructor/issues/25)) ([7b1ab2c](https://github.com/gravity-ui/blog-constructor/commit/7b1ab2c12aa9ef4f8e5a11853508a9b439a196d7))
+
 ## [2.3.0](https://github.com/gravity-ui/blog-constructor/compare/v2.2.0...v2.3.0) (2023-04-10)
 
 

package/README.md

@@ -47,6 +47,8 @@ import {BlogPostPage, BlogConstructorProvider} from '@gravity-ui/blog-constructo
 
 ```
 
+Documentation about [providerProps](./src/constructor/README.md).
+
 Also blog-constructor have server components to help you transform your data if you need
 
 ```jsx

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

@@ -38,7 +38,6 @@ const Posts_1 = require("../../components/Posts/Posts");
 const PostsError_1 = require("../../components/PostsError/PostsError");
 const constants_1 = require("../../constants");
 const FeedContext_1 = require("../../contexts/FeedContext");
-const LocaleContext_1 = require("../../contexts/LocaleContext");
 const RouterContext_1 = require("../../contexts/RouterContext");
 /**
  * @deprecated Metrika will be deleted after launch of analyticsEvents
@@ -56,7 +55,6 @@ const Feed = ({ image }) => {
     var _a;
     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 { locale } = (0, react_1.useContext)(LocaleContext_1.LocaleContext);
     const handleAnalytics = (0, page_constructor_1.useAnalytics)(common_1.DefaultEventNames.ShowMore);
     const [{ errorLoad, errorShowMore, isFetching, isShowMoreFetching, isShowMoreVisible, lastLoadedCount, postCountOnPage, postsOnPage, pinnedPostOnPage, currentPage, queryParams, }, dispatch,] = (0, react_1.useReducer)(reducer_1.reducer, {
         errorLoad: false,
@@ -79,6 +77,12 @@ const Feed = ({ image }) => {
     };
     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);
+        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);
@@ -169,22 +173,6 @@ const Feed = ({ image }) => {
         value: tag.slug,
         icon: tag.icon && react_1.default.createElement(uikit_1.Icon, { data: tag.icon }),
     })), [tags]);
-    (0, react_1.useEffect)(() => {
-        const queryString = Object.keys(queryParams)
-            .reduce((acc, curr) => {
-            if (curr === PAGE_QUERY && queryParams[curr] === FIRST_PAGE) {
-                return acc;
-            }
-            if (queryParams[curr]) {
-                acc.push(`${curr}=${queryParams[curr]}`);
-            }
-            return acc;
-        }, [])
-            .join('&');
-        const pathPrefix = (locale === null || locale === void 0 ? void 0 : locale.pathPrefix) ? `/${locale === null || locale === void 0 ? void 0 : locale.pathPrefix}/` : '/';
-        const newUrl = `${pathPrefix}blog${queryString ? `?${queryString}` : ''}`;
-        window.history.replaceState(Object.assign(Object.assign({}, window.history.state), { as: newUrl, url: newUrl }), '', newUrl);
-    }, [locale === null || locale === void 0 ? void 0 : locale.pathPrefix, queryParams]);
     return (react_1.default.createElement("div", null,
         react_1.default.createElement(FeedHeader_1.FeedHeader, { verticalOffset: "s", tags: tagItems, services: serviceItems, setIsFetching: setIsFetching, handleChangeQuery: handleChangeQueryParams, queryParams: queryParams, background: {
                 fullWidth: true,

package/build/cjs/components/Paginator/Paginator.css

@@ -9,6 +9,8 @@ unpredictable css rules order in build */
 }
 .bc-paginator__link {
   text-decoration: none;
+  pointer-events: none;
+  color: var(--yc-color-text-primary);
 }
 .bc-paginator__item {
   display: inline-flex;

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

@@ -36,7 +36,7 @@ const PaginatorItem = ({ dataKey, mods, content, onClick, loading = false, }) =>
     const itemKey = Number(dataKey) > 0 ? Number(dataKey) : dataKey;
     const navTag = itemKey > 0 ? `${mods.type || 'page'}=${itemKey}` : itemKey;
     const navigationLink = `${urlPath || ''}?${navTag}`;
-    return (react_1.default.createElement("a", { href: navigationLink, className: b('link', mods), onClick: (event) => event.preventDefault() },
-        react_1.default.createElement(uikit_1.Button, { view: "flat", size: "xl", className: b('item', mods), onClick: () => onClick === null || onClick === void 0 ? void 0 : onClick(itemKey), loading: loading && Boolean(mods.active) }, content)));
+    return (react_1.default.createElement(uikit_1.Button, { view: "flat", size: "xl", className: b('item', mods), onClick: () => onClick === null || onClick === void 0 ? void 0 : onClick(itemKey), loading: loading && Boolean(mods.active) },
+        react_1.default.createElement("a", { href: navigationLink, className: b('link'), onClick: (event) => event.preventDefault() }, content)));
 };
 exports.PaginatorItem = PaginatorItem;

package/build/cjs/contexts/RouterContext.d.ts

@@ -5,5 +5,6 @@ export interface RouterContextProps {
     as: string;
     hostname: string;
     query?: Query;
+    updateQueryCallback: (query: Query) => void;
 }
 export declare const RouterContext: React.Context<RouterContextProps>;

package/build/cjs/contexts/UserContext.d.ts

@@ -1,18 +1,6 @@
 import React from 'react';
 export interface UserAccount {
     uid: string;
-    login: string;
-    avatarId: string;
-    displayName?: string;
-    lang?: string;
-    hasStaffLogin?: boolean;
 }
-export interface User extends UserAccount {
-    accounts: UserAccount[];
-    passportHost: string;
-    avatarHost: string;
-    status: string;
-    yandexuid: string;
-}
-export type UserContextProps = Partial<User>;
-export declare const UserContext: React.Context<Partial<User>>;
+export type UserContextProps = Partial<UserAccount>;
+export declare const UserContext: React.Context<Partial<UserAccount>>;

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

@@ -9,7 +9,6 @@ import { Posts } from '../../components/Posts/Posts';
 import { PostsError } from '../../components/PostsError/PostsError';
 import { BlogMetrikaGoalIds } from '../../constants';
 import { FeedContext } from '../../contexts/FeedContext';
-import { LocaleContext } from '../../contexts/LocaleContext';
 import { RouterContext } from '../../contexts/RouterContext';
 /**
  * @deprecated Metrika will be deleted after launch of analyticsEvents
@@ -27,7 +26,6 @@ export const Feed = ({ image }) => {
     var _a;
     const { posts, totalCount, tags, services, pinnedPost, getPosts, pageCountForShowSupportButtons, } = useContext(FeedContext);
     const router = useContext(RouterContext);
-    const { locale } = useContext(LocaleContext);
     const handleAnalytics = useAnalytics(DefaultEventNames.ShowMore);
     const [{ errorLoad, errorShowMore, isFetching, isShowMoreFetching, isShowMoreVisible, lastLoadedCount, postCountOnPage, postsOnPage, pinnedPostOnPage, currentPage, queryParams, }, dispatch,] = useReducer(reducer, {
         errorLoad: false,
@@ -50,6 +48,12 @@ export const Feed = ({ image }) => {
     };
     const handleChangeQueryParams = (value) => {
         dispatch({ type: ActionTypes.QueryParamsChange, payload: value });
+        const hasFirstPageQuery = Object.keys(value).some((queryKey) => queryKey === PAGE_QUERY && value[queryKey] === FIRST_PAGE);
+        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);
@@ -140,22 +144,6 @@ export const Feed = ({ image }) => {
         value: tag.slug,
         icon: tag.icon && React.createElement(Icon, { data: tag.icon }),
     })), [tags]);
-    useEffect(() => {
-        const queryString = Object.keys(queryParams)
-            .reduce((acc, curr) => {
-            if (curr === PAGE_QUERY && queryParams[curr] === FIRST_PAGE) {
-                return acc;
-            }
-            if (queryParams[curr]) {
-                acc.push(`${curr}=${queryParams[curr]}`);
-            }
-            return acc;
-        }, [])
-            .join('&');
-        const pathPrefix = (locale === null || locale === void 0 ? void 0 : locale.pathPrefix) ? `/${locale === null || locale === void 0 ? void 0 : locale.pathPrefix}/` : '/';
-        const newUrl = `${pathPrefix}blog${queryString ? `?${queryString}` : ''}`;
-        window.history.replaceState(Object.assign(Object.assign({}, window.history.state), { as: newUrl, url: newUrl }), '', newUrl);
-    }, [locale === null || locale === void 0 ? void 0 : locale.pathPrefix, queryParams]);
     return (React.createElement("div", null,
         React.createElement(FeedHeader, { verticalOffset: "s", tags: tagItems, services: serviceItems, setIsFetching: setIsFetching, handleChangeQuery: handleChangeQueryParams, queryParams: queryParams, background: {
                 fullWidth: true,

package/build/esm/components/Paginator/Paginator.css

@@ -9,6 +9,8 @@ unpredictable css rules order in build */
 }
 .bc-paginator__link {
   text-decoration: none;
+  pointer-events: none;
+  color: var(--yc-color-text-primary);
 }
 .bc-paginator__item {
   display: inline-flex;

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

@@ -11,6 +11,6 @@ export const PaginatorItem = ({ dataKey, mods, content, onClick, loading = false
     const itemKey = Number(dataKey) > 0 ? Number(dataKey) : dataKey;
     const navTag = itemKey > 0 ? `${mods.type || 'page'}=${itemKey}` : itemKey;
     const navigationLink = `${urlPath || ''}?${navTag}`;
-    return (React.createElement("a", { href: navigationLink, className: b('link', mods), onClick: (event) => event.preventDefault() },
-        React.createElement(Button, { view: "flat", size: "xl", className: b('item', mods), onClick: () => onClick === null || onClick === void 0 ? void 0 : onClick(itemKey), loading: loading && Boolean(mods.active) }, content)));
+    return (React.createElement(Button, { view: "flat", size: "xl", className: b('item', mods), onClick: () => onClick === null || onClick === void 0 ? void 0 : onClick(itemKey), loading: loading && Boolean(mods.active) },
+        React.createElement("a", { href: navigationLink, className: b('link'), onClick: (event) => event.preventDefault() }, content)));
 };

package/build/esm/contexts/RouterContext.d.ts

@@ -5,5 +5,6 @@ export interface RouterContextProps {
     as: string;
     hostname: string;
     query?: Query;
+    updateQueryCallback: (query: Query) => void;
 }
 export declare const RouterContext: React.Context<RouterContextProps>;

package/build/esm/contexts/UserContext.d.ts

@@ -1,18 +1,6 @@
 import React from 'react';
 export interface UserAccount {
     uid: string;
-    login: string;
-    avatarId: string;
-    displayName?: string;
-    lang?: string;
-    hasStaffLogin?: boolean;
 }
-export interface User extends UserAccount {
-    accounts: UserAccount[];
-    passportHost: string;
-    avatarHost: string;
-    status: string;
-    yandexuid: string;
-}
-export type UserContextProps = Partial<User>;
-export declare const UserContext: React.Context<Partial<User>>;
+export type UserContextProps = Partial<UserAccount>;
+export declare const UserContext: React.Context<Partial<UserAccount>>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/blog-constructor",
-  "version": "2.3.0",
+  "version": "3.0.1",
   "description": "Gravity UI Blog Constructor",
   "license": "MIT",
   "repository": {