@gravity-ui/blog-constructor 5.16.1 → 6.0.0

package/build/esm/components/PostInfo/components/ReadingTime.js

@@ -1,6 +1,6 @@
 import React from 'react';
 import { Icon } from '@gravity-ui/uikit';
-import { Keyset, i18 } from '../../../i18n';
+import { Keyset, i18n } from '../../../i18n';
 import { Time } from '../../../icons/Time';
 import { block } from '../../../utils/cn';
 import '../PostInfo.css';
@@ -9,4 +9,4 @@ const ICON_SIZE = 16;
 export const ReadingTime = ({ readingTime, size = 's', id, qa }) => (React.createElement("div", { className: b('item', { size }), id: id, "data-qa": qa },
     React.createElement("span", { className: b('icon') },
         React.createElement(Icon, { data: Time, size: ICON_SIZE, className: b('icon-color') })),
-    i18(Keyset.ContextReadingTime, { count: readingTime })));
+    i18n(Keyset.ContextReadingTime, { count: readingTime })));

package/build/esm/components/PostInfo/components/Save.d.ts

@@ -1,4 +1,5 @@
 import React from 'react';
+import { AnalyticsEventsProp } from '@gravity-ui/page-constructor';
 import { QAProps } from '../../../models/common';
 import '../PostInfo.css';
 type SaveProps = QAProps & {
@@ -7,11 +8,8 @@ type SaveProps = QAProps & {
     hasUserLike: boolean;
     handleUserLike: () => void;
     theme?: 'light' | 'dark';
-    /**
-     * @deprecated Metrika will be deleted after launch of analyticsEvents
-     */
-    metrikaGoal?: string;
     size?: 's' | 'm';
+    analyticsEvents?: AnalyticsEventsProp;
 };
 /**
  * Components for 'save' blog UI-component
@@ -19,11 +17,11 @@ type SaveProps = QAProps & {
  * @param title - post title
  * @param postId - post id
  * @param hasUserLike - flag what blog has like from current user
- * @param metrikaGoal - metrika goal name
  * @param qa - test-attr
  * @param size - text size
+ * @param analyticsEvents - a single or collection of objects detailing analytics events
  *
  * @returns jsx
  */
-export declare const Save: ({ title, postId, hasUserLike, handleUserLike, metrikaGoal, size, theme, qa, }: SaveProps) => React.JSX.Element;
+export declare const Save: ({ title, postId, hasUserLike, handleUserLike, size, theme, qa, analyticsEvents, }: SaveProps) => React.JSX.Element;
 export {};

package/build/esm/components/PostInfo/components/Save.js

@@ -2,8 +2,6 @@ import React, { useContext } from 'react';
 import { useAnalytics } from '@gravity-ui/page-constructor';
 import { Icon } from '@gravity-ui/uikit';
 import { LikesContext } from '../../../contexts/LikesContext';
-import metrika from '../../../counters/metrika';
-import { MetrikaCounter } from '../../../counters/utils';
 import { Save as SaveIcon } from '../../../icons/Save';
 import { SaveFilled } from '../../../icons/SaveFilled';
 import { DefaultEventNames } from '../../../models/common';
@@ -18,13 +16,13 @@ const b = block('post-info');
  * @param title - post title
  * @param postId - post id
  * @param hasUserLike - flag what blog has like from current user
- * @param metrikaGoal - metrika goal name
  * @param qa - test-attr
  * @param size - text size
+ * @param analyticsEvents - a single or collection of objects detailing analytics events
  *
  * @returns jsx
  */
-export const Save = ({ title, postId, hasUserLike, handleUserLike, metrikaGoal, size, theme, qa, }) => {
+export const Save = ({ title, postId, hasUserLike, handleUserLike, size, theme, qa, analyticsEvents, }) => {
     const { toggleLike, isSignedInUser, requireSignIn } = useContext(LikesContext);
     const handleAnalytics = useAnalytics(DefaultEventNames.SaveButton);
     const isLikeable = Boolean(toggleLike);
@@ -43,8 +41,7 @@ export const Save = ({ title, postId, hasUserLike, handleUserLike, metrikaGoal,
             }
             postLikeStatus(postId, Boolean(hasUserLike));
             handleUserLike();
-            metrika.reachGoal(MetrikaCounter.CrossSite, metrikaGoal);
-            handleAnalytics();
+            handleAnalytics(analyticsEvents);
         }, "data-qa": qa },
         React.createElement("div", { className: b('content', { cursor: isLikeable, theme }) },
             React.createElement("span", { className: b('icon') },

package/build/esm/components/PostInfo/components/Sharing.d.ts

@@ -1,11 +1,9 @@
 import React from 'react';
+import { AnalyticsEventsProp } from '@gravity-ui/page-constructor';
 import '../PostInfo.css';
 type SharingProps = {
     theme?: 'light' | 'dark';
-    /**
-     * @deprecated Metrika will be deleted after launch of analyticsEvents
-     */
-    metrikaGoal?: string;
+    analyticsEvents?: AnalyticsEventsProp;
 };
-export declare const Sharing: ({ theme, metrikaGoal }: SharingProps) => React.JSX.Element;
+export declare const Sharing: ({ theme, analyticsEvents }: SharingProps) => React.JSX.Element;
 export {};

package/build/esm/components/PostInfo/components/Sharing.js

@@ -4,28 +4,22 @@ import { useAnalytics } from '@gravity-ui/page-constructor';
 import { MobileContext } from '../../../contexts/MobileContext';
 import { PostPageContext } from '../../../contexts/PostPageContext';
 import { RouterContext } from '../../../contexts/RouterContext';
-import metrika from '../../../counters/metrika';
-import { MetrikaCounter } from '../../../counters/utils';
-import { Keyset, i18 } from '../../../i18n';
+import { Keyset, i18n } from '../../../i18n';
 import { ShareArrowUp } from '../../../icons/ShareArrowUp';
 import { DefaultEventNames } from '../../../models/common';
 import { block } from '../../../utils/cn';
 import { getAbsolutePath } from '../../../utils/common';
 import '../PostInfo.css';
 const b = block('post-info');
-export const Sharing = ({ theme, metrikaGoal }) => {
+export const Sharing = ({ theme, analyticsEvents }) => {
     const router = useContext(RouterContext);
     const isMobile = useContext(MobileContext);
     const { shareOptions } = useContext(PostPageContext);
     const handleAnalyticsGlobal = useAnalytics(DefaultEventNames.ShareButton);
-    const handleMetrika = useCallback(() => {
-        metrika.reachGoal(MetrikaCounter.CrossSite, metrikaGoal);
-    }, [metrikaGoal]);
     const handleAnalytics = useCallback(() => {
-        handleAnalyticsGlobal();
-        handleMetrika();
-    }, [handleAnalyticsGlobal, handleMetrika]);
+        handleAnalyticsGlobal(analyticsEvents);
+    }, [analyticsEvents, handleAnalyticsGlobal]);
     return (React.createElement("div", { className: b('item') },
         React.createElement("div", { className: b('icon') },
-            React.createElement(SharePopover, { url: getAbsolutePath(router), className: b('share'), iconClass: b('share-icon'), switcherClassName: b('switcher', { theme }), tooltipClassName: b('popup'), useWebShareApi: isMobile, direction: ShareLayoutDirection.Column, buttonTitle: i18(Keyset.ActionShare), customIcon: ShareArrowUp, placement: "bottom", openByHover: false, shareOptions: shareOptions, onClick: handleAnalytics }))));
+            React.createElement(SharePopover, { url: getAbsolutePath(router), className: b('share'), iconClass: b('share-icon'), switcherClassName: b('switcher', { theme }), tooltipClassName: b('popup'), useWebShareApi: isMobile, direction: ShareLayoutDirection.Column, buttonTitle: i18n(Keyset.ActionShare), customIcon: ShareArrowUp, placement: "bottom", openByHover: false, shareOptions: shareOptions, onClick: handleAnalytics }))));
 };

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

@@ -1,7 +1,7 @@
 import React from 'react';
 import { CardLayoutBlock } from '@gravity-ui/page-constructor';
 import { Button } from '@gravity-ui/uikit';
-import { Keyset, i18 } from '../../i18n';
+import { Keyset, i18n } from '../../i18n';
 import { PostCardSize, PostCardTitleHeadingLevel } from '../../models/common';
 import { block } from '../../utils/cn';
 import { Paginator } from '../Paginator/Paginator';
@@ -22,9 +22,9 @@ export const Posts = ({ containerId, pinnedPostOnPage, currentPage, postsOnPage,
                 ? PostCardTitleHeadingLevel.H3
                 : PostCardTitleHeadingLevel.H2 }))))) : (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 }, i18n(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)))),
+            React.createElement("div", null, i18n(Keyset.ErrorTitle)),
+            React.createElement("div", null, i18n(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, queryParams: queryParams }))))));

package/build/esm/components/PostsEmpty/PostsEmpty.js

@@ -1,8 +1,8 @@
 import React from 'react';
-import { Keyset, i18 } from '../../i18n';
+import { Keyset, i18n } from '../../i18n';
 import { block } from '../../utils/cn';
 import './PostsEmpty.css';
 const b = block('posts-empty');
 export const PostsEmpty = () => (React.createElement("div", { className: b('container') },
-    React.createElement("div", { className: b('title') }, i18(Keyset.TitleEmptyContainer)),
-    React.createElement("div", { className: b('subtitle') }, i18(Keyset.ContextEmptyContainer))));
+    React.createElement("div", { className: b('title') }, i18n(Keyset.TitleEmptyContainer)),
+    React.createElement("div", { className: b('subtitle') }, i18n(Keyset.ContextEmptyContainer))));

package/build/esm/components/PostsError/PostsError.js

@@ -1,14 +1,14 @@
 import React from 'react';
 import { Button } from '@gravity-ui/uikit';
-import { Keyset, i18 } from '../../i18n';
+import { Keyset, i18n } from '../../i18n';
 import { block } from '../../utils/cn';
 import './PostError.css';
 const b = block('posts-error');
 export const PostsError = ({ onButtonClick }) => {
     const handleClick = () => (onButtonClick ? onButtonClick() : window.location.reload());
     return (React.createElement("div", { className: b('container') },
-        React.createElement("div", { className: b('title') }, i18(Keyset.ErrorTitle)),
-        React.createElement("div", { className: b('subtitle') }, i18(Keyset.PostLoadError)),
+        React.createElement("div", { className: b('title') }, i18n(Keyset.ErrorTitle)),
+        React.createElement("div", { className: b('subtitle') }, i18n(Keyset.PostLoadError)),
         React.createElement("div", { className: b('button') },
-            React.createElement(Button, { size: "xl", view: "outlined", onClick: handleClick }, i18(Keyset.ActionTryAgain)))));
+            React.createElement(Button, { size: "xl", view: "outlined", onClick: handleClick }, i18n(Keyset.ActionTryAgain)))));
 };

package/build/esm/components/PromptSignIn/PromptSignIn.js

@@ -1,15 +1,15 @@
 import { __rest } from "tslib";
 import React from 'react';
-import { Keyset, i18 } from '../../i18n';
+import { Keyset, i18n } from '../../i18n';
 import { Prompt } from '../Prompt/Prompt';
 /**
  * Authentication Popup that appears when user action requires login
  * @returns {JSX|null}
  */
 export const PromptSignIn = (_a) => {
-    var { text = i18(Keyset.PromptSignInOnLike), onClickSignIn = () => alert(i18(Keyset.SignIn)), actions = [
+    var { text = i18n(Keyset.PromptSignInOnLike), onClickSignIn = () => alert(i18n(Keyset.SignIn)), actions = [
         {
-            children: i18(Keyset.SignIn),
+            children: i18n(Keyset.SignIn),
             onClick: onClickSignIn,
             size: 'l',
         },

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

@@ -2,7 +2,7 @@ import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Icon, TextInput } from '@gravity-ui/uikit';
 import lodashDebounce from 'lodash/debounce';
 import { useIsIPhone } from '../../hooks/useIsIPhone';
-import { Keyset, i18 } from '../../i18n';
+import { Keyset, i18n } from '../../i18n';
 import { Close } from '../../icons/Close';
 import { SearchIcon } from '../../icons/SearchIcon';
 import { block } from '../../utils/cn';
@@ -17,7 +17,7 @@ const AUTOFOCUS_TIMEOUT = 0;
  *
  * @returns {JSX|null}
  */
-export const Search = ({ className, initialValue, onSubmit, debounce = 300, placeholder = i18(Keyset.Search), size = 'm', autoFocus = false, value: externalValue, }) => {
+export const Search = ({ className, initialValue, onSubmit, debounce = 300, placeholder = i18n(Keyset.Search), size = 'm', autoFocus = false, value: externalValue, }) => {
     const handleChange = lodashDebounce(onSubmit, debounce);
     const [value, setValue] = useState(initialValue);
     const inputRef = useRef(null);

package/build/esm/constants.d.ts

@@ -9,13 +9,14 @@ export declare const BREAKPOINTS: {
 export declare const DEFAULT_THEME = "light";
 export declare const UIKIT_ROOT_CLASS = "g-root";
 export declare const UIKIT_THEME_LIGHT_CLASS: string;
-export declare enum BlogMetrikaGoalIds {
+export declare enum DefaultGoalIds {
     shareTop = "SITE_BLOG_SHARE-TOP_CLICK",
     shareBottom = "SITE_BLOG_SHARE-BOTTOM_CLICK",
     breadcrumbsTop = "SITE_BLOG_BREADCRUMBS-TOP_CLICK",
     breadcrumbsBottom = "SITE_BLOG_BREADCRUMBS-BOTTOM_CLICK",
     saveTop = "SITE_BLOG_SAVE-TOP_CLICK",
     saveBottom = "SITE_BLOG_SAVE-BOTTOM_CLICK",
+    saveSuggest = "SITE_BLOG_SAVE-SUGGEST_CLICK",
     suggest = "SITE_BLOG_INTERESTING-CARD_CLICK",
     bannerCommon = "SITE_BLOG_TEXT-BANNER_CLICK",
     cta = "SITE_BLOG_CTA_CLICK",

package/build/esm/constants.js

@@ -9,24 +9,25 @@ export const BREAKPOINTS = {
 export const DEFAULT_THEME = 'light';
 export const UIKIT_ROOT_CLASS = 'g-root';
 export const UIKIT_THEME_LIGHT_CLASS = `${UIKIT_ROOT_CLASS}_theme_${DEFAULT_THEME}`;
-export var BlogMetrikaGoalIds;
-(function (BlogMetrikaGoalIds) {
-    BlogMetrikaGoalIds["shareTop"] = "SITE_BLOG_SHARE-TOP_CLICK";
-    BlogMetrikaGoalIds["shareBottom"] = "SITE_BLOG_SHARE-BOTTOM_CLICK";
-    BlogMetrikaGoalIds["breadcrumbsTop"] = "SITE_BLOG_BREADCRUMBS-TOP_CLICK";
-    BlogMetrikaGoalIds["breadcrumbsBottom"] = "SITE_BLOG_BREADCRUMBS-BOTTOM_CLICK";
-    BlogMetrikaGoalIds["saveTop"] = "SITE_BLOG_SAVE-TOP_CLICK";
-    BlogMetrikaGoalIds["saveBottom"] = "SITE_BLOG_SAVE-BOTTOM_CLICK";
-    BlogMetrikaGoalIds["suggest"] = "SITE_BLOG_INTERESTING-CARD_CLICK";
-    BlogMetrikaGoalIds["bannerCommon"] = "SITE_BLOG_TEXT-BANNER_CLICK";
-    BlogMetrikaGoalIds["cta"] = "SITE_BLOG_CTA_CLICK";
-    BlogMetrikaGoalIds["tag"] = "SITE_BLOG_THEME-SELECTOR_CLCK";
-    BlogMetrikaGoalIds["service"] = "SITE_BLOG_SERVICE-SELECTOR_CLCK";
-    BlogMetrikaGoalIds["showMore"] = "SITE_BLOG-PAGINATION_SHOW-MORE_CLCK";
-    BlogMetrikaGoalIds["next"] = "SITE_BLOG-PAGINATION_NEXT_CLCK";
-    BlogMetrikaGoalIds["home"] = "SITE_BLOG-PAGINATION_HOME_CLCK";
-    BlogMetrikaGoalIds["page"] = "SITE_BLOG-PAGINATION_PAGE-NMBR_CLCK";
-})(BlogMetrikaGoalIds || (BlogMetrikaGoalIds = {}));
+export var DefaultGoalIds;
+(function (DefaultGoalIds) {
+    DefaultGoalIds["shareTop"] = "SITE_BLOG_SHARE-TOP_CLICK";
+    DefaultGoalIds["shareBottom"] = "SITE_BLOG_SHARE-BOTTOM_CLICK";
+    DefaultGoalIds["breadcrumbsTop"] = "SITE_BLOG_BREADCRUMBS-TOP_CLICK";
+    DefaultGoalIds["breadcrumbsBottom"] = "SITE_BLOG_BREADCRUMBS-BOTTOM_CLICK";
+    DefaultGoalIds["saveTop"] = "SITE_BLOG_SAVE-TOP_CLICK";
+    DefaultGoalIds["saveBottom"] = "SITE_BLOG_SAVE-BOTTOM_CLICK";
+    DefaultGoalIds["saveSuggest"] = "SITE_BLOG_SAVE-SUGGEST_CLICK";
+    DefaultGoalIds["suggest"] = "SITE_BLOG_INTERESTING-CARD_CLICK";
+    DefaultGoalIds["bannerCommon"] = "SITE_BLOG_TEXT-BANNER_CLICK";
+    DefaultGoalIds["cta"] = "SITE_BLOG_CTA_CLICK";
+    DefaultGoalIds["tag"] = "SITE_BLOG_THEME-SELECTOR_CLCK";
+    DefaultGoalIds["service"] = "SITE_BLOG_SERVICE-SELECTOR_CLCK";
+    DefaultGoalIds["showMore"] = "SITE_BLOG-PAGINATION_SHOW-MORE_CLCK";
+    DefaultGoalIds["next"] = "SITE_BLOG-PAGINATION_NEXT_CLCK";
+    DefaultGoalIds["home"] = "SITE_BLOG-PAGINATION_HOME_CLCK";
+    DefaultGoalIds["page"] = "SITE_BLOG-PAGINATION_PAGE-NMBR_CLCK";
+})(DefaultGoalIds || (DefaultGoalIds = {}));
 export const DEFAULT_PADDINGS = {
     [PaddingsDirections.bottom]: 'l',
     [PaddingsDirections.top]: 'xs',

package/build/esm/constructor/BlogConstructorProvider.js

@@ -1,5 +1,5 @@
 import React, { Fragment } from 'react';
-import { AnalyticsContext } from '@gravity-ui/page-constructor';
+import { AnalyticsContext, ThemeContext, } from '@gravity-ui/page-constructor';
 import { DEFAULT_THEME } from '../constants';
 import { DeviceContext } from '../contexts/DeviceContext';
 import { LocaleContext } from '../contexts/LocaleContext';
@@ -10,6 +10,7 @@ import { ThemeValueContext } from '../contexts/theme/ThemeValueContext';
 export const BlogConstructorProvider = ({ isMobile, locale = {}, router = {}, theme = DEFAULT_THEME, device = {}, analytics = {}, settings = {}, children, }) => {
     const context = [
         React.createElement(ThemeValueContext.Provider, { value: { themeValue: theme }, key: "theme-context" }),
+        React.createElement(ThemeContext.Provider, { value: { theme: theme }, key: "pc-theme" }),
         React.createElement(LocaleContext.Provider, { value: { locale }, key: "locale-context" }),
         React.createElement(RouterContext.Provider, { value: router, key: "router-context" }),
         React.createElement(MobileContext.Provider, { value: Boolean(isMobile), key: "is-mobile-context" }),

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

@@ -1,5 +1,5 @@
 @charset "UTF-8";
-@import '~@doc-tools/transform/dist/css/yfm.css';
+@import '~@diplodoc/transform/dist/css/yfm.css';
 :root {
   --header-height: 64px;
 }

package/build/esm/contexts/LocaleContext.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Lang } from '../models/locale';
+import { Lang } from '@gravity-ui/uikit';
 export const LocaleContext = React.createContext({
     locale: {
         code: 'en-En',

package/build/esm/counters/metrika.js

@@ -1,6 +1,3 @@
-/**
- * @deprecated Metrika will be deleted after launch of analyticsEvents
- */
 const Goal = {
     SUPPORT_OPEN_FORM: 'SUPPORTOPENFORM',
     SUPPORT_STEP_1_SUBMIT: 'SUPPORTSTEP1SUBMIT',

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

@@ -1,4 +1,4 @@
-export declare enum MetrikaCounter {
+export declare enum AnalyticsCounter {
     Main = "main",
     CrossSite = "cross-site",
     Scale = "scale"

package/build/esm/counters/utils.js

@@ -1,6 +1,6 @@
-export var MetrikaCounter;
-(function (MetrikaCounter) {
-    MetrikaCounter["Main"] = "main";
-    MetrikaCounter["CrossSite"] = "cross-site";
-    MetrikaCounter["Scale"] = "scale";
-})(MetrikaCounter || (MetrikaCounter = {}));
+export var AnalyticsCounter;
+(function (AnalyticsCounter) {
+    AnalyticsCounter["Main"] = "main";
+    AnalyticsCounter["CrossSite"] = "cross-site";
+    AnalyticsCounter["Scale"] = "scale";
+})(AnalyticsCounter || (AnalyticsCounter = {}));

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

@@ -1,5 +1,3 @@
-import { I18N } from '@gravity-ui/i18n';
-export declare const i18n: I18N;
 export declare enum Keyset {
     Title = "title",
     TitleBreadcrumbs = "title_breadcrumbs",
@@ -21,4 +19,4 @@ export declare enum Keyset {
     PromptSignInOnLike = "prompt_sign_in_on_like",
     SignIn = "Sign In"
 }
-export declare const i18: (key: string, params?: import("@gravity-ui/i18n").Params | undefined) => string;
+export declare const i18n: (key: Keyset, params?: import("@gravity-ui/i18n").Params | undefined) => string;

package/build/esm/i18n/index.js

@@ -1,7 +1,5 @@
-import { I18N } from '@gravity-ui/i18n';
-import { Lang } from '../models/locale';
-const KEYSET_NAME = 'blog';
-export const i18n = new I18N();
+import { addComponentKeysets } from '@gravity-ui/uikit/i18n';
+const NAMESPACE = 'blog';
 export var Keyset;
 (function (Keyset) {
     Keyset["Title"] = "title";
@@ -24,7 +22,7 @@ export var Keyset;
     Keyset["PromptSignInOnLike"] = "prompt_sign_in_on_like";
     Keyset["SignIn"] = "Sign In";
 })(Keyset || (Keyset = {}));
-i18n.registerKeyset(Lang.En, KEYSET_NAME, {
+const en = {
     [Keyset.Title]: 'Blog',
     [Keyset.TitleBreadcrumbs]: 'Blog',
     [Keyset.TitleSuggest]: 'See also',
@@ -48,8 +46,8 @@ i18n.registerKeyset(Lang.En, KEYSET_NAME, {
         '{{count}} mins to read',
     ],
     [Keyset.SignIn]: 'Sign In',
-});
-i18n.registerKeyset(Lang.Ru, KEYSET_NAME, {
+};
+const ru = {
     [Keyset.Title]: 'Блог',
     [Keyset.TitleBreadcrumbs]: 'Блог',
     [Keyset.TitleSuggest]: 'Читать также',
@@ -73,5 +71,5 @@ i18n.registerKeyset(Lang.Ru, KEYSET_NAME, {
         '{{count}} минут чтения',
     ],
     [Keyset.SignIn]: 'Войти',
-});
-export const i18 = i18n.keyset(KEYSET_NAME);
+};
+export const i18n = addComponentKeysets({ en, ru }, NAMESPACE);

package/build/esm/index.d.ts

@@ -1,4 +1,3 @@
-export { configure } from './configure';
 export { BlogConstructorProvider } from './constructor/BlogConstructorProvider';
 export { BlogPostPage } from './containers/BlogPostPage/BlogPostPage';
 export { BlogPage } from './containers/BlogPage/BlogPage';

package/build/esm/index.js

@@ -1,4 +1,3 @@
-export { configure } from './configure';
 export { BlogConstructorProvider } from './constructor/BlogConstructorProvider';
 export { BlogPostPage } from './containers/BlogPostPage/BlogPostPage';
 export { BlogPage } from './containers/BlogPage/BlogPage';

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

@@ -1,5 +1,5 @@
 import { ReactNode } from 'react';
-import { MarkdownItPluginCb } from '@doc-tools/transform/lib/plugins/typings';
+import { MarkdownItPluginCb } from '@diplodoc/transform/lib/plugins/typings';
 import { HeaderBlockProps as PageConstructorHeaderBlockProps } from '@gravity-ui/page-constructor';
 import { IBrowser, IDevice } from 'ua-parser-js';
 import { Locale } from '../models/locale';

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

@@ -1,7 +1,4 @@
-export declare enum Lang {
-    Ru = "ru",
-    En = "en"
-}
+import { Lang } from '@gravity-ui/uikit';
 export declare enum Currency {
     RUB = "RUB",
     USD = "USD",

package/build/esm/models/locale.js

@@ -1,8 +1,3 @@
-export var Lang;
-(function (Lang) {
-    Lang["Ru"] = "ru";
-    Lang["En"] = "en";
-})(Lang || (Lang = {}));
 export var Currency;
 (function (Currency) {
     Currency["RUB"] = "RUB";

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

@@ -1,7 +1,8 @@
 /// <reference types="lodash" />
-import { ContentBlockProps, HeaderBreadCrumbsProps, MetrikaGoal, NewMetrikaGoal } from '@gravity-ui/page-constructor';
+import { AnalyticsEvent, AnalyticsEventsProp, ContentBlockProps, HeaderBreadCrumbsProps } from '@gravity-ui/page-constructor';
 import { RouterContextProps } from '../contexts/RouterContext';
 import { GetPostsRequest, Query, Tag } from '../models/common';
+import { AnalyticsCounter } from '../counters/utils';
 export interface QueryParam {
     name: string;
     value?: string | number | null;
@@ -38,9 +39,20 @@ type GetBreadcrumbsProps = {
 };
 export declare const getBlogPath: (pathPrefix: string) => string;
 export declare const getBreadcrumbs: ({ tags, blogPath }: GetBreadcrumbsProps) => HeaderBreadCrumbsProps;
-export declare const isMetrikaExist: (goal: NewMetrikaGoal, existGoals: NewMetrikaGoal[]) => boolean;
-export declare const getBlogElementMetrika: (blogCustomGoal: NewMetrikaGoal, existingGoals?: MetrikaGoal) => string | string[] | NewMetrikaGoal[];
+export declare const getMergedAnalyticsEvents: (analyticEvents: AnalyticsEventsProp, existringEvents?: AnalyticsEventsProp) => {
+    name: string;
+    type?: string | undefined;
+    counters?: import("@gravity-ui/page-constructor").AnalyticsCounters | undefined;
+    context?: string | undefined;
+    target?: string | undefined;
+}[];
 export declare const getFeedQueryParams: (queryString: Query, pageNumber?: number) => GetPostsRequest;
 export declare const scrollOnPageChange: (containerId: string) => void;
 export declare const getQaAttributes: (qa?: string, ...customKeys: (string | Array<string>)[]) => Record<string, string>;
+type PrepareAnalyticsEventArgs = {
+    name: string;
+    counter?: AnalyticsCounter;
+    options?: Record<string, string | number>;
+};
+export declare const prepareAnalyticsEvent: ({ name, counter, options, }: PrepareAnalyticsEventArgs) => AnalyticsEvent;
 export {};

package/build/esm/utils/common.js

@@ -1,12 +1,12 @@
 import { __rest } from "tslib";
 import { format, parse } from 'url';
-import { isNewMetrikaFormat, } from '@gravity-ui/page-constructor';
 import camelCase from 'lodash/camelCase';
 import debounce from 'lodash/debounce';
 import flatten from 'lodash/flatten';
 import memoize from 'lodash/memoize';
 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';
+import { Keyset, i18n } from '../i18n';
+import { AnalyticsCounter } from '../counters/utils';
 const QA_ATTRIBUTES_KEYS = ['container', 'content', 'wrapper', 'image', 'button'];
 export function getAbsolutePath(router, url) {
     if (!router || !router.pathname) {
@@ -54,7 +54,7 @@ export const getBlogPath = (pathPrefix) => {
 };
 export const getBreadcrumbs = ({ tags, blogPath }) => {
     const breadcrumbs = {
-        items: [{ text: i18(Keyset.TitleBreadcrumbs), url: blogPath }],
+        items: [{ text: i18n(Keyset.TitleBreadcrumbs), url: blogPath }],
         theme: 'light',
     };
     if (tags === null || tags === void 0 ? void 0 : tags.length) {
@@ -65,21 +65,19 @@ export const getBreadcrumbs = ({ tags, blogPath }) => {
     }
     return breadcrumbs;
 };
-export const isMetrikaExist = (goal, existGoals) => {
-    return Boolean(existGoals.find((existGoal) => goal.name === existGoal.name));
-};
-export const getBlogElementMetrika = (blogCustomGoal, existingGoals) => {
-    if (existingGoals) {
-        if (isNewMetrikaFormat(existingGoals) && !isMetrikaExist(blogCustomGoal, existingGoals)) {
-            const goals = [...existingGoals];
-            goals.push(blogCustomGoal);
-            return goals;
-        }
-        return existingGoals;
+const getArrayOfEvents = (events) => {
+    if (!events) {
+        return [];
     }
-    else {
-        return [blogCustomGoal];
+    if (Array.isArray(events)) {
+        return events;
     }
+    return [events];
+};
+export const getMergedAnalyticsEvents = (analyticEvents, existringEvents) => {
+    const eventsAsArray = getArrayOfEvents(analyticEvents);
+    const existingAsArray = getArrayOfEvents(existringEvents);
+    return eventsAsArray.concat(existingAsArray);
 };
 export const getFeedQueryParams = (queryString, pageNumber) => {
     const queryParams = getPageSearchParams(queryString);
@@ -109,4 +107,7 @@ export const getQaAttributes = (qa, ...customKeys) => {
         attributes.default = qa;
     }
     return attributes;
-};
+};
+export const prepareAnalyticsEvent = ({ name, counter = AnalyticsCounter.Main, options = {}, }) => (Object.assign(Object.assign({}, options), { name, counters: {
+        include: [counter],
+    } }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gravity-ui/blog-constructor",
-  "version": "5.16.1",
+  "version": "6.0.0",
   "description": "Gravity UI Blog Constructor",
   "license": "MIT",
   "repository": {
@@ -60,8 +60,8 @@
   },
   "dependencies": {
     "@bem-react/classname": "^1.6.0",
-    "@gravity-ui/components": "^2.8.0",
-    "@gravity-ui/i18n": "^1.1.0",
+    "@gravity-ui/components": "^3.0.0",
+    "@gravity-ui/i18n": "^1.3.0",
     "lodash": "^4.17.21",
     "react-helmet": "^6.1.0",
     "ua-parser-js": "^0.7.28",
@@ -70,9 +70,9 @@
     "uuid": "^9.0.1"
   },
   "peerDependencies": {
-    "@doc-tools/transform": "^3.3.2",
-    "@gravity-ui/page-constructor": "^4.45.0",
-    "@gravity-ui/uikit": "^5.12.0",
+    "@diplodoc/transform": "^4.10.7",
+    "@gravity-ui/page-constructor": "^5.0.0",
+    "@gravity-ui/uikit": "^6.1.1",
     "react": "^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "devDependencies": {
@@ -80,19 +80,20 @@
     "@babel/preset-react": "^7.22.5",
     "@babel/preset-typescript": "^7.22.5",
     "@commitlint/config-conventional": "^17.4.3",
-    "@doc-tools/transform": "^3.11.0",
+    "@diplodoc/transform": "^4.10.8",
     "@gravity-ui/eslint-config": "^3.1.1",
-    "@gravity-ui/page-constructor": "^4.46.0",
+    "@gravity-ui/page-constructor": "^5.1.0",
     "@gravity-ui/prettier-config": "^1.1.0",
     "@gravity-ui/stylelint-config": "^4.0.1",
     "@gravity-ui/tsconfig": "^1.0.0",
-    "@gravity-ui/uikit": "^5.25.0",
+    "@gravity-ui/uikit": "^6.2.0",
     "@jest/environment": "^29.7.0",
-    "@storybook/addon-essentials": "^7.0.27",
-    "@storybook/cli": "^7.0.27",
+    "@storybook/addon-essentials": "^7.6.17",
+    "@storybook/addon-mdx-gfm": "^7.6.17",
+    "@storybook/cli": "^7.6.17",
     "@storybook/preset-scss": "^1.0.3",
-    "@storybook/react": "^7.0.27",
-    "@storybook/react-webpack5": "^7.0.27",
+    "@storybook/react": "^7.6.17",
+    "@storybook/react-webpack5": "^7.6.17",
     "@testing-library/dom": "^9.3.3",
     "@testing-library/jest-dom": "^5.16.5",
     "@testing-library/react": "^14.0.0",
@@ -127,7 +128,7 @@
     "rimraf": "^3.0.2",
     "sass": "^1.54.4",
     "sass-loader": "^13.3.1",
-    "storybook": "^7.0.27",
+    "storybook": "^7.6.17",
     "stylelint": "^15.11.0",
     "ts-jest": "^29.0.5",
     "typescript": "^4.9.3"

package/server/data/contentFilter.d.ts

@@ -1,5 +1,5 @@
 import { PageContent } from '@gravity-ui/page-constructor';
-import { Lang } from '../models/locale';
+import { Lang } from '@gravity-ui/uikit';
 type FilteringOptions = {
     lang: Lang;
     region?: string;