@gravity-ui/blog-constructor 5.16.1 → 6.0.0

package/build/cjs/components/PostInfo/SuggestPostInfo.js

@@ -9,7 +9,10 @@ const cn_1 = require("../../utils/cn");
 const Date_1 = require("./components/Date");
 const ReadingTime_1 = require("./components/ReadingTime");
 const Save_1 = require("./components/Save");
+const common_2 = require("../../utils/common");
+const constants_1 = require("../../constants");
 const b = (0, cn_1.block)('post-info');
+const saveEvents = (0, common_2.prepareAnalyticsEvent)({ name: constants_1.DefaultGoalIds.saveSuggest });
 /**
  * Suggest blog card info component
  *
@@ -37,6 +40,6 @@ const SuggestPostInfo = ({ postId, date, readingTime, likes, size = common_1.Pos
         react_1.default.createElement("div", { className: b('suggest-container') },
             date && react_1.default.createElement(Date_1.Date, { date: date, size: size, id: dateId }),
             readingTime && (react_1.default.createElement(ReadingTime_1.ReadingTime, { readingTime: readingTime, size: size, id: readingTimeId }))),
-        likes && postId && (react_1.default.createElement(Save_1.Save, { postId: postId, title: likesCount, hasUserLike: hasUserLike, handleUserLike: handleLike, size: size, qa: qa }))));
+        likes && postId && (react_1.default.createElement(Save_1.Save, { postId: postId, title: likesCount, analyticsEvents: saveEvents, hasUserLike: hasUserLike, handleUserLike: handleLike, size: size, qa: qa }))));
 };
 exports.SuggestPostInfo = SuggestPostInfo;

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

@@ -12,5 +12,5 @@ const ICON_SIZE = 16;
 const ReadingTime = ({ readingTime, size = 's', id, qa }) => (react_1.default.createElement("div", { className: b('item', { size }), id: id, "data-qa": qa },
     react_1.default.createElement("span", { className: b('icon') },
         react_1.default.createElement(uikit_1.Icon, { data: Time_1.Time, size: ICON_SIZE, className: b('icon-color') })),
-    (0, i18n_1.i18)(i18n_1.Keyset.ContextReadingTime, { count: readingTime })));
+    (0, i18n_1.i18n)(i18n_1.Keyset.ContextReadingTime, { count: readingTime })));
 exports.ReadingTime = ReadingTime;

package/build/cjs/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';
 type SaveProps = QAProps & {
     title: string | number;
@@ -6,11 +7,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
@@ -18,11 +16,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/cjs/components/PostInfo/components/Save.js

@@ -6,8 +6,6 @@ const react_1 = tslib_1.__importStar(require("react"));
 const page_constructor_1 = require("@gravity-ui/page-constructor");
 const uikit_1 = require("@gravity-ui/uikit");
 const LikesContext_1 = require("../../../contexts/LikesContext");
-const metrika_1 = tslib_1.__importDefault(require("../../../counters/metrika"));
-const utils_1 = require("../../../counters/utils");
 const Save_1 = require("../../../icons/Save");
 const SaveFilled_1 = require("../../../icons/SaveFilled");
 const common_1 = require("../../../models/common");
@@ -21,13 +19,13 @@ const b = (0, cn_1.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
  */
-const Save = ({ title, postId, hasUserLike, handleUserLike, metrikaGoal, size, theme, qa, }) => {
+const Save = ({ title, postId, hasUserLike, handleUserLike, size, theme, qa, analyticsEvents, }) => {
     const { toggleLike, isSignedInUser, requireSignIn } = (0, react_1.useContext)(LikesContext_1.LikesContext);
     const handleAnalytics = (0, page_constructor_1.useAnalytics)(common_1.DefaultEventNames.SaveButton);
     const isLikeable = Boolean(toggleLike);
@@ -46,8 +44,7 @@ const Save = ({ title, postId, hasUserLike, handleUserLike, metrikaGoal, size, t
             }
             (0, common_2.postLikeStatus)(postId, Boolean(hasUserLike));
             handleUserLike();
-            metrika_1.default.reachGoal(utils_1.MetrikaCounter.CrossSite, metrikaGoal);
-            handleAnalytics();
+            handleAnalytics(analyticsEvents);
         }, "data-qa": qa },
         react_1.default.createElement("div", { className: b('content', { cursor: isLikeable, theme }) },
             react_1.default.createElement("span", { className: b('icon') },

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

@@ -1,10 +1,8 @@
 import React from 'react';
+import { AnalyticsEventsProp } from '@gravity-ui/page-constructor';
 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/cjs/components/PostInfo/components/Sharing.js

@@ -8,28 +8,22 @@ const page_constructor_1 = require("@gravity-ui/page-constructor");
 const MobileContext_1 = require("../../../contexts/MobileContext");
 const PostPageContext_1 = require("../../../contexts/PostPageContext");
 const RouterContext_1 = require("../../../contexts/RouterContext");
-const metrika_1 = tslib_1.__importDefault(require("../../../counters/metrika"));
-const utils_1 = require("../../../counters/utils");
 const i18n_1 = require("../../../i18n");
 const ShareArrowUp_1 = require("../../../icons/ShareArrowUp");
 const common_1 = require("../../../models/common");
 const cn_1 = require("../../../utils/cn");
 const common_2 = require("../../../utils/common");
 const b = (0, cn_1.block)('post-info');
-const Sharing = ({ theme, metrikaGoal }) => {
+const Sharing = ({ theme, analyticsEvents }) => {
     const router = (0, react_1.useContext)(RouterContext_1.RouterContext);
     const isMobile = (0, react_1.useContext)(MobileContext_1.MobileContext);
     const { shareOptions } = (0, react_1.useContext)(PostPageContext_1.PostPageContext);
     const handleAnalyticsGlobal = (0, page_constructor_1.useAnalytics)(common_1.DefaultEventNames.ShareButton);
-    const handleMetrika = (0, react_1.useCallback)(() => {
-        metrika_1.default.reachGoal(utils_1.MetrikaCounter.CrossSite, metrikaGoal);
-    }, [metrikaGoal]);
     const handleAnalytics = (0, react_1.useCallback)(() => {
-        handleAnalyticsGlobal();
-        handleMetrika();
-    }, [handleAnalyticsGlobal, handleMetrika]);
+        handleAnalyticsGlobal(analyticsEvents);
+    }, [analyticsEvents, handleAnalyticsGlobal]);
     return (react_1.default.createElement("div", { className: b('item') },
         react_1.default.createElement("div", { className: b('icon') },
-            react_1.default.createElement(components_1.SharePopover, { url: (0, common_2.getAbsolutePath)(router), className: b('share'), iconClass: b('share-icon'), switcherClassName: b('switcher', { theme }), tooltipClassName: b('popup'), useWebShareApi: isMobile, direction: components_1.ShareLayoutDirection.Column, buttonTitle: (0, i18n_1.i18)(i18n_1.Keyset.ActionShare), customIcon: ShareArrowUp_1.ShareArrowUp, placement: "bottom", openByHover: false, shareOptions: shareOptions, onClick: handleAnalytics }))));
+            react_1.default.createElement(components_1.SharePopover, { url: (0, common_2.getAbsolutePath)(router), className: b('share'), iconClass: b('share-icon'), switcherClassName: b('switcher', { theme }), tooltipClassName: b('popup'), useWebShareApi: isMobile, direction: components_1.ShareLayoutDirection.Column, buttonTitle: (0, i18n_1.i18n)(i18n_1.Keyset.ActionShare), customIcon: ShareArrowUp_1.ShareArrowUp, placement: "bottom", openByHover: false, shareOptions: shareOptions, onClick: handleAnalytics }))));
 };
 exports.Sharing = Sharing;

package/build/cjs/components/Posts/Posts.js

@@ -25,10 +25,10 @@ const Posts = ({ containerId, pinnedPostOnPage, currentPage, postsOnPage, isShow
                 ? common_1.PostCardTitleHeadingLevel.H3
                 : common_1.PostCardTitleHeadingLevel.H2 }))))) : (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 }, (0, i18n_1.i18n)(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)))),
+            react_1.default.createElement("div", null, (0, i18n_1.i18n)(i18n_1.Keyset.ErrorTitle)),
+            react_1.default.createElement("div", null, (0, i18n_1.i18n)(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, queryParams: queryParams }))))));
 exports.Posts = Posts;

package/build/cjs/components/PostsEmpty/PostsEmpty.js

@@ -7,6 +7,6 @@ const i18n_1 = require("../../i18n");
 const cn_1 = require("../../utils/cn");
 const b = (0, cn_1.block)('posts-empty');
 const PostsEmpty = () => (react_1.default.createElement("div", { className: b('container') },
-    react_1.default.createElement("div", { className: b('title') }, (0, i18n_1.i18)(i18n_1.Keyset.TitleEmptyContainer)),
-    react_1.default.createElement("div", { className: b('subtitle') }, (0, i18n_1.i18)(i18n_1.Keyset.ContextEmptyContainer))));
+    react_1.default.createElement("div", { className: b('title') }, (0, i18n_1.i18n)(i18n_1.Keyset.TitleEmptyContainer)),
+    react_1.default.createElement("div", { className: b('subtitle') }, (0, i18n_1.i18n)(i18n_1.Keyset.ContextEmptyContainer))));
 exports.PostsEmpty = PostsEmpty;

package/build/cjs/components/PostsError/PostsError.js

@@ -10,9 +10,9 @@ const b = (0, cn_1.block)('posts-error');
 const PostsError = ({ onButtonClick }) => {
     const handleClick = () => (onButtonClick ? onButtonClick() : window.location.reload());
     return (react_1.default.createElement("div", { className: b('container') },
-        react_1.default.createElement("div", { className: b('title') }, (0, i18n_1.i18)(i18n_1.Keyset.ErrorTitle)),
-        react_1.default.createElement("div", { className: b('subtitle') }, (0, i18n_1.i18)(i18n_1.Keyset.PostLoadError)),
+        react_1.default.createElement("div", { className: b('title') }, (0, i18n_1.i18n)(i18n_1.Keyset.ErrorTitle)),
+        react_1.default.createElement("div", { className: b('subtitle') }, (0, i18n_1.i18n)(i18n_1.Keyset.PostLoadError)),
         react_1.default.createElement("div", { className: b('button') },
-            react_1.default.createElement(uikit_1.Button, { size: "xl", view: "outlined", onClick: handleClick }, (0, i18n_1.i18)(i18n_1.Keyset.ActionTryAgain)))));
+            react_1.default.createElement(uikit_1.Button, { size: "xl", view: "outlined", onClick: handleClick }, (0, i18n_1.i18n)(i18n_1.Keyset.ActionTryAgain)))));
 };
 exports.PostsError = PostsError;

package/build/cjs/components/PromptSignIn/PromptSignIn.js

@@ -10,9 +10,9 @@ const Prompt_1 = require("../Prompt/Prompt");
  * @returns {JSX|null}
  */
 const PromptSignIn = (_a) => {
-    var { text = (0, i18n_1.i18)(i18n_1.Keyset.PromptSignInOnLike), onClickSignIn = () => alert((0, i18n_1.i18)(i18n_1.Keyset.SignIn)), actions = [
+    var { text = (0, i18n_1.i18n)(i18n_1.Keyset.PromptSignInOnLike), onClickSignIn = () => alert((0, i18n_1.i18n)(i18n_1.Keyset.SignIn)), actions = [
         {
-            children: (0, i18n_1.i18)(i18n_1.Keyset.SignIn),
+            children: (0, i18n_1.i18n)(i18n_1.Keyset.SignIn),
             onClick: onClickSignIn,
             size: 'l',
         },

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

@@ -20,7 +20,7 @@ const AUTOFOCUS_TIMEOUT = 0;
  *
  * @returns {JSX|null}
  */
-const Search = ({ className, initialValue, onSubmit, debounce = 300, placeholder = (0, i18n_1.i18)(i18n_1.Keyset.Search), size = 'm', autoFocus = false, value: externalValue, }) => {
+const Search = ({ className, initialValue, onSubmit, debounce = 300, placeholder = (0, i18n_1.i18n)(i18n_1.Keyset.Search), size = 'm', autoFocus = false, value: externalValue, }) => {
     const handleChange = (0, debounce_1.default)(onSubmit, debounce);
     const [value, setValue] = (0, react_1.useState)(initialValue);
     const inputRef = (0, react_1.useRef)(null);

package/build/cjs/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/cjs/constants.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DEFAULT_PADDINGS = exports.BlogMetrikaGoalIds = exports.UIKIT_THEME_LIGHT_CLASS = exports.UIKIT_ROOT_CLASS = exports.DEFAULT_THEME = exports.BREAKPOINTS = void 0;
+exports.DEFAULT_PADDINGS = exports.DefaultGoalIds = exports.UIKIT_THEME_LIGHT_CLASS = exports.UIKIT_ROOT_CLASS = exports.DEFAULT_THEME = exports.BREAKPOINTS = void 0;
 const paddings_1 = require("./models/paddings");
 exports.BREAKPOINTS = {
     xs: 0,
@@ -12,24 +12,25 @@ exports.BREAKPOINTS = {
 exports.DEFAULT_THEME = 'light';
 exports.UIKIT_ROOT_CLASS = 'g-root';
 exports.UIKIT_THEME_LIGHT_CLASS = `${exports.UIKIT_ROOT_CLASS}_theme_${exports.DEFAULT_THEME}`;
-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 = exports.BlogMetrikaGoalIds || (exports.BlogMetrikaGoalIds = {}));
+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 = exports.DefaultGoalIds || (exports.DefaultGoalIds = {}));
 exports.DEFAULT_PADDINGS = {
     [paddings_1.PaddingsDirections.bottom]: 'l',
     [paddings_1.PaddingsDirections.top]: 'xs',

package/build/cjs/constructor/BlogConstructorProvider.js

@@ -14,6 +14,7 @@ const ThemeValueContext_1 = require("../contexts/theme/ThemeValueContext");
 const BlogConstructorProvider = ({ isMobile, locale = {}, router = {}, theme = constants_1.DEFAULT_THEME, device = {}, analytics = {}, settings = {}, children, }) => {
     const context = [
         react_1.default.createElement(ThemeValueContext_1.ThemeValueContext.Provider, { value: { themeValue: theme }, key: "theme-context" }),
+        react_1.default.createElement(page_constructor_1.ThemeContext.Provider, { value: { theme: theme }, key: "pc-theme" }),
         react_1.default.createElement(LocaleContext_1.LocaleContext.Provider, { value: { locale }, key: "locale-context" }),
         react_1.default.createElement(RouterContext_1.RouterContext.Provider, { value: router, key: "router-context" }),
         react_1.default.createElement(MobileContext_1.MobileContext.Provider, { value: Boolean(isMobile), key: "is-mobile-context" }),

package/build/cjs/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/cjs/contexts/LocaleContext.js

@@ -3,11 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LocaleContext = void 0;
 const tslib_1 = require("tslib");
 const react_1 = tslib_1.__importDefault(require("react"));
-const locale_1 = require("../models/locale");
+const uikit_1 = require("@gravity-ui/uikit");
 exports.LocaleContext = react_1.default.createContext({
     locale: {
         code: 'en-En',
-        lang: locale_1.Lang.En,
+        lang: uikit_1.Lang.En,
         langName: 'English',
         pathPrefix: 'en',
     },

package/build/cjs/counters/metrika.js

@@ -1,9 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCounters = void 0;
-/**
- * @deprecated Metrika will be deleted after launch of analyticsEvents
- */
 const Goal = {
     SUPPORT_OPEN_FORM: 'SUPPORTOPENFORM',
     SUPPORT_STEP_1_SUBMIT: 'SUPPORTSTEP1SUBMIT',

package/build/cjs/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/cjs/counters/utils.js

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MetrikaCounter = void 0;
-var MetrikaCounter;
-(function (MetrikaCounter) {
-    MetrikaCounter["Main"] = "main";
-    MetrikaCounter["CrossSite"] = "cross-site";
-    MetrikaCounter["Scale"] = "scale";
-})(MetrikaCounter = exports.MetrikaCounter || (exports.MetrikaCounter = {}));
+exports.AnalyticsCounter = void 0;
+var AnalyticsCounter;
+(function (AnalyticsCounter) {
+    AnalyticsCounter["Main"] = "main";
+    AnalyticsCounter["CrossSite"] = "cross-site";
+    AnalyticsCounter["Scale"] = "scale";
+})(AnalyticsCounter = exports.AnalyticsCounter || (exports.AnalyticsCounter = {}));

package/build/cjs/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/cjs/i18n/index.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.i18 = exports.Keyset = exports.i18n = void 0;
-const i18n_1 = require("@gravity-ui/i18n");
-const locale_1 = require("../models/locale");
-const KEYSET_NAME = 'blog';
-exports.i18n = new i18n_1.I18N();
+exports.i18n = exports.Keyset = void 0;
+const i18n_1 = require("@gravity-ui/uikit/i18n");
+const NAMESPACE = 'blog';
 var Keyset;
 (function (Keyset) {
     Keyset["Title"] = "title";
@@ -27,7 +25,7 @@ var Keyset;
     Keyset["PromptSignInOnLike"] = "prompt_sign_in_on_like";
     Keyset["SignIn"] = "Sign In";
 })(Keyset = exports.Keyset || (exports.Keyset = {}));
-exports.i18n.registerKeyset(locale_1.Lang.En, KEYSET_NAME, {
+const en = {
     [Keyset.Title]: 'Blog',
     [Keyset.TitleBreadcrumbs]: 'Blog',
     [Keyset.TitleSuggest]: 'See also',
@@ -51,8 +49,8 @@ exports.i18n.registerKeyset(locale_1.Lang.En, KEYSET_NAME, {
         '{{count}} mins to read',
     ],
     [Keyset.SignIn]: 'Sign In',
-});
-exports.i18n.registerKeyset(locale_1.Lang.Ru, KEYSET_NAME, {
+};
+const ru = {
     [Keyset.Title]: 'Блог',
     [Keyset.TitleBreadcrumbs]: 'Блог',
     [Keyset.TitleSuggest]: 'Читать также',
@@ -76,5 +74,5 @@ exports.i18n.registerKeyset(locale_1.Lang.Ru, KEYSET_NAME, {
         '{{count}} минут чтения',
     ],
     [Keyset.SignIn]: 'Войти',
-});
-exports.i18 = exports.i18n.keyset(KEYSET_NAME);
+};
+exports.i18n = (0, i18n_1.addComponentKeysets)({ en, ru }, NAMESPACE);

package/build/cjs/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/cjs/index.js

@@ -1,9 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BREAKPOINTS = exports.BlogPage = exports.BlogPostPage = exports.BlogConstructorProvider = exports.configure = void 0;
+exports.BREAKPOINTS = exports.BlogPage = exports.BlogPostPage = exports.BlogConstructorProvider = void 0;
 const tslib_1 = require("tslib");
-var configure_1 = require("./configure");
-Object.defineProperty(exports, "configure", { enumerable: true, get: function () { return configure_1.configure; } });
 var BlogConstructorProvider_1 = require("./constructor/BlogConstructorProvider");
 Object.defineProperty(exports, "BlogConstructorProvider", { enumerable: true, get: function () { return BlogConstructorProvider_1.BlogConstructorProvider; } });
 var BlogPostPage_1 = require("./containers/BlogPostPage/BlogPostPage");

package/build/cjs/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/cjs/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/cjs/models/locale.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Currency = exports.Lang = void 0;
-var Lang;
-(function (Lang) {
-    Lang["Ru"] = "ru";
-    Lang["En"] = "en";
-})(Lang = exports.Lang || (exports.Lang = {}));
+exports.Currency = void 0;
 var Currency;
 (function (Currency) {
     Currency["RUB"] = "RUB";

package/build/cjs/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/cjs/utils/common.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getQaAttributes = exports.scrollOnPageChange = exports.getFeedQueryParams = exports.getBlogElementMetrika = exports.isMetrikaExist = exports.getBreadcrumbs = exports.getBlogPath = exports.updateContentSizes = exports.postLikeStatus = exports.getTags = exports.scrollToHash = exports.getPageSearchParams = exports.getAbsolutePath = void 0;
+exports.prepareAnalyticsEvent = exports.getQaAttributes = exports.scrollOnPageChange = exports.getFeedQueryParams = exports.getMergedAnalyticsEvents = exports.getBreadcrumbs = exports.getBlogPath = exports.updateContentSizes = exports.postLikeStatus = exports.getTags = exports.scrollToHash = exports.getPageSearchParams = exports.getAbsolutePath = void 0;
 const tslib_1 = require("tslib");
 const url_1 = require("url");
-const page_constructor_1 = require("@gravity-ui/page-constructor");
 const camelCase_1 = tslib_1.__importDefault(require("lodash/camelCase"));
 const debounce_1 = tslib_1.__importDefault(require("lodash/debounce"));
 const flatten_1 = tslib_1.__importDefault(require("lodash/flatten"));
 const memoize_1 = tslib_1.__importDefault(require("lodash/memoize"));
 const constants_1 = require("../blocks/constants");
 const i18n_1 = require("../i18n");
+const utils_1 = require("../counters/utils");
 const QA_ATTRIBUTES_KEYS = ['container', 'content', 'wrapper', 'image', 'button'];
 function getAbsolutePath(router, url) {
     if (!router || !router.pathname) {
@@ -62,7 +62,7 @@ const getBlogPath = (pathPrefix) => {
 exports.getBlogPath = getBlogPath;
 const getBreadcrumbs = ({ tags, blogPath }) => {
     const breadcrumbs = {
-        items: [{ text: (0, i18n_1.i18)(i18n_1.Keyset.TitleBreadcrumbs), url: blogPath }],
+        items: [{ text: (0, i18n_1.i18n)(i18n_1.Keyset.TitleBreadcrumbs), url: blogPath }],
         theme: 'light',
     };
     if (tags === null || tags === void 0 ? void 0 : tags.length) {
@@ -74,24 +74,21 @@ const getBreadcrumbs = ({ tags, blogPath }) => {
     return breadcrumbs;
 };
 exports.getBreadcrumbs = getBreadcrumbs;
-const isMetrikaExist = (goal, existGoals) => {
-    return Boolean(existGoals.find((existGoal) => goal.name === existGoal.name));
-};
-exports.isMetrikaExist = isMetrikaExist;
-const getBlogElementMetrika = (blogCustomGoal, existingGoals) => {
-    if (existingGoals) {
-        if ((0, page_constructor_1.isNewMetrikaFormat)(existingGoals) && !(0, exports.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];
+};
+const getMergedAnalyticsEvents = (analyticEvents, existringEvents) => {
+    const eventsAsArray = getArrayOfEvents(analyticEvents);
+    const existingAsArray = getArrayOfEvents(existringEvents);
+    return eventsAsArray.concat(existingAsArray);
 };
-exports.getBlogElementMetrika = getBlogElementMetrika;
+exports.getMergedAnalyticsEvents = getMergedAnalyticsEvents;
 const getFeedQueryParams = (queryString, pageNumber) => {
     const queryParams = (0, exports.getPageSearchParams)(queryString);
     const tags = queryParams.get('tags') || undefined;
@@ -123,4 +120,8 @@ const getQaAttributes = (qa, ...customKeys) => {
     }
     return attributes;
 };
-exports.getQaAttributes = getQaAttributes;
+exports.getQaAttributes = getQaAttributes;
+const prepareAnalyticsEvent = ({ name, counter = utils_1.AnalyticsCounter.Main, options = {}, }) => (Object.assign(Object.assign({}, options), { name, counters: {
+        include: [counter],
+    } }));
+exports.prepareAnalyticsEvent = prepareAnalyticsEvent;

package/build/esm/blocks/Banner/Banner.js

@@ -2,13 +2,18 @@ import { __rest } from "tslib";
 import React from 'react';
 import { Content, Image } from '@gravity-ui/page-constructor';
 import { Wrapper } from '../../components/Wrapper/Wrapper';
-import { BlogMetrikaGoalIds } from '../../constants';
 import { PaddingsDirections } from '../../models/paddings';
 import { block } from '../../utils/cn';
-import { getBlogElementMetrika, getQaAttributes, updateContentSizes } from '../../utils/common';
+import { getMergedAnalyticsEvents, getQaAttributes, prepareAnalyticsEvent, updateContentSizes, } from '../../utils/common';
+import { DefaultGoalIds } from '../../constants';
+import { AnalyticsCounter } from '../../counters/utils';
 import './Banner.css';
 const b = block('banner');
 const BANNER_CUSTOM_QA_ATTRIBUTES = ['image-container'];
+const buttonGoals = prepareAnalyticsEvent({
+    name: DefaultGoalIds.bannerCommon,
+    counter: AnalyticsCounter.CrossSite,
+});
 export const Banner = (_a) => {
     var _b;
     var { color, imageSize = 's', image, paddingTop, paddingBottom, qa } = _a, content = __rest(_a, ["color", "imageSize", "image", "paddingTop", "paddingBottom", "qa"]);
@@ -18,16 +23,9 @@ export const Banner = (_a) => {
         contentStyle.backgroundColor = color;
     }
     const contentData = updateContentSizes(content);
-    /**
-     * @deprecated Metrika will be deleted after launch of analyticsEvents
-     */
-    const metrikaGoal = {
-        name: BlogMetrikaGoalIds.bannerCommon,
-        isCrossSite: true,
-    };
     (_b = contentData.buttons) === null || _b === void 0 ? void 0 : _b.forEach((button) => {
         // eslint-disable-next-line no-not-accumulator-reassign/no-not-accumulator-reassign
-        button.metrikaGoals = getBlogElementMetrika(metrikaGoal, button.metrikaGoals);
+        button.analyticsEvents = getMergedAnalyticsEvents(buttonGoals, button.analyticsEvents);
     });
     return (React.createElement(Wrapper, { paddings: {
             [PaddingsDirections.top]: paddingTop,