@diplodoc/client 3.12.0 → 4.0.0

package/build/components/App/Page.d.ts

@@ -1,14 +1,8 @@
-import type { PropsWithChildren } from 'react';
-import type { AppProps, PageData, WithNavigation } from './index';
+import type { AppProps, PageData } from './index';
 import type { Settings } from '../../utils';
 import type { DocBasePageData } from '@diplodoc/components';
 import type { Props as HeaderControlsProps } from '../HeaderControls';
 import React from 'react';
-type Props = PropsWithChildren<Partial<AppProps> & {
-    data: PageData;
-    headerHeight: number;
-}>;
-export declare function Page({ data, ...pageProps }: Props): React.JSX.Element;
 type PageProps<T extends {} = {}> = {
     data: DocBasePageData<T> & PageData;
     props: {
@@ -16,6 +10,5 @@ type PageProps<T extends {} = {}> = {
     } & Settings;
     controls: HeaderControlsProps;
 };
-export declare function LegacyNavPage({ data, props, controls }: PageProps): React.JSX.Element;
-export declare function RichNavPage({ data, props, controls }: PageProps<WithNavigation>): React.JSX.Element;
+export declare function Page({ data, props, controls }: PageProps): React.JSX.Element;
 export {};

package/build/components/App/index.d.ts

@@ -22,7 +22,7 @@ export interface AppProps {
     viewerInterface?: Record<string, boolean>;
 }
 export type WithNavigation = {
-    navigation: NavigationData;
+    navigation?: NavigationData;
 };
 export type DocContentPageData = DocContentPageDataBase<PageContent>;
 export type PageData = DocPageData | DocLeadingPageData | DocContentPageData;

package/build/components/ConstructorPage/useNavigation.d.ts

@@ -16,6 +16,8 @@ export declare const useNavigation: (data: DocBasePageData<WithNavigation>, cont
         renderNavigation: () => React.JSX.Element;
         logo: {
             icon: import("@gravity-ui/page-constructor").ImageProps;
+        } | {
+            icon: import("@gravity-ui/page-constructor").ImageProps;
             text?: string;
             url?: string;
             urlTitle?: string;
@@ -28,6 +30,6 @@ export declare const useNavigation: (data: DocBasePageData<WithNavigation>, cont
             alt?: string;
             light: import("@gravity-ui/page-constructor").NavigationLogoData;
         };
-    };
+    } | undefined;
     withControls: boolean;
 };

package/build/server/app.js

@@ -787,8 +787,6 @@ function useSearch() {
 
 // EXTERNAL MODULE: ./src/interceptors/leading-page-links.js
 var leading_page_links = __webpack_require__(90101);
-// EXTERNAL MODULE: ./node_modules/@swc/helpers/esm/_object_without_properties.js + 1 modules
-var _object_without_properties = __webpack_require__(98848);
 // EXTERNAL MODULE: ./node_modules/@gravity-ui/page-constructor/build/esm/containers/PageConstructor/Provider.js
 var Provider = __webpack_require__(77725);
 // EXTERNAL MODULE: ./node_modules/@gravity-ui/page-constructor/build/esm/containers/PageConstructor/PageConstructor.js + 18 modules
@@ -1067,11 +1065,15 @@ function findItem(right, left, type) {
         return item.type === type;
     });
 }
+var EmptyNavigation = {};
+var EmptyHeader = {};
+var EmptyLeftItems = [];
+var EmptyRightItems = [];
 var useNavigation = function(data, controls, CustomControls, CustomSuggest, viewerInterface) {
     var toc = data.toc;
-    var navigation = toc.navigation;
-    var _navigation_header = navigation.header, header = _navigation_header === void 0 ? {} : _navigation_header, logo = navigation.logo;
-    var _header_leftItems = header.leftItems, leftItems = _header_leftItems === void 0 ? [] : _header_leftItems, _header_rightItems = header.rightItems, rightItems = _header_rightItems === void 0 ? [] : _header_rightItems;
+    var navigation = toc.navigation || EmptyNavigation;
+    var _navigation_header = navigation.header, header = _navigation_header === void 0 ? EmptyHeader : _navigation_header, logo = navigation.logo;
+    var _header_leftItems = header.leftItems, leftItems = _header_leftItems === void 0 ? EmptyLeftItems : _header_leftItems, _header_rightItems = header.rightItems, rightItems = _header_rightItems === void 0 ? EmptyRightItems : _header_rightItems;
     var withControls = findItem(rightItems, leftItems, 'controls');
     var withSearch = findItem(rightItems, leftItems, 'search');
     var search = useSearch();
@@ -1118,7 +1120,7 @@ var useNavigation = function(data, controls, CustomControls, CustomSuggest, view
     ]);
     var layout = (0,react.useMemo)(function() {
         var _logo_icon;
-        return {
+        return EmptyNavigation === navigation ? undefined : {
             header: {
                 leftItems: []
             },
@@ -1141,7 +1143,8 @@ var useNavigation = function(data, controls, CustomControls, CustomSuggest, view
         navigationData,
         navigationTocData,
         mobileControlsData,
-        logo
+        logo,
+        navigation
     ]);
     var config = (0,react.useMemo)(function() {
         return {
@@ -1175,58 +1178,11 @@ var useNavigation = function(data, controls, CustomControls, CustomSuggest, view
 
 
 
-
-function App_Page_Page(_param) {
-    var data = _param.data, pageProps = (0,_object_without_properties._)(_param, [
-        "data"
-    ]);
-    var type = (0,utils/* .getPageType */.C2)(data);
-    var Page = (0,utils/* .getPageByType */.N7)(type);
-    return /*#__PURE__*/ (0,jsx_runtime.jsx)(Layout, {
-        headerHeight: pageProps.headerHeight,
-        children: /*#__PURE__*/ (0,jsx_runtime.jsx)(Layout.Content, {
-            children: /*#__PURE__*/ (0,jsx_runtime.jsx)(Page, (0,_object_spread._)({}, data, pageProps))
-        })
-    });
-}
-function LegacyNavPage(param) {
-    var data = param.data, props = param.props, controls = param.controls;
-    var theme = props.theme;
-    var CustomPage = (0,react.useCallback)(function() {
-        return /*#__PURE__*/ (0,jsx_runtime.jsx)(ConstructorPage, (0,_object_spread._)({}, data.data));
-    }, [
-        data
-    ]);
-    var content = useContent(data, CustomPage);
-    var custom = (0,react.useMemo)(function() {
-        return {
-            blocks: content.custom
-        };
-    }, [
-        content
-    ]);
-    return /*#__PURE__*/ (0,jsx_runtime.jsx)(App_Page_Page, (0,_object_spread_props._)((0,_object_spread._)({
-        data: data,
-        headerHeight: 0
-    }, props, controls), {
-        children: /*#__PURE__*/ (0,jsx_runtime.jsx)(Provider/* .PageConstructorProvider */.W, {
-            theme: theme,
-            projectSettings: {
-                disableCompress: true
-            },
-            ssrConfig: {
-                isServer: Boolean(false)
-            },
-            children: /*#__PURE__*/ (0,jsx_runtime.jsx)(PageConstructor/* .PageConstructor */.C, {
-                custom: custom,
-                content: content.layout
-            })
-        })
-    }));
-}
-function RichNavPage(param) {
+function App_Page_Page(param) {
     var data = param.data, props = param.props, controls = param.controls;
     var theme = props.theme, fullScreen = props.fullScreen;
+    var type = (0,utils/* .getPageType */.C2)(data);
+    var Page = (0,utils/* .getPageByType */.N7)(type);
     var CustomSuggest = (0,react.useCallback)(function() {
         return /*#__PURE__*/ (0,jsx_runtime.jsx)(Suggest, {});
     }, []);
@@ -1237,29 +1193,32 @@ function RichNavPage(param) {
     ]);
     var navigation = useNavigation(data, controls, CustomControls, CustomSuggest);
     var CustomPage = (0,react.useCallback)(function() {
-        return /*#__PURE__*/ (0,jsx_runtime.jsx)(App_Page_Page, (0,_object_spread_props._)((0,_object_spread._)({
-            data: data,
-            headerHeight: fullScreen ? 0 : 64
-        }, props, navigation.withControls ? filterControls(controls, [
-            'theme',
-            'onChangeTheme',
-            'textSize',
-            'onChangeTextSize',
-            'wideFormat',
-            'onChangeWideFormat',
-            'showMiniToc',
-            'onChangeShowMiniToc',
-            'langs',
-            'onChangeLang'
-        ]) : controls), {
-            children: /*#__PURE__*/ (0,jsx_runtime.jsx)(ConstructorPage, (0,_object_spread._)({}, data.data))
-        }));
+        return /*#__PURE__*/ (0,jsx_runtime.jsx)(Layout, {
+            headerHeight: fullScreen || !navigation.layout ? 0 : 64,
+            children: /*#__PURE__*/ (0,jsx_runtime.jsx)(Layout.Content, {
+                children: /*#__PURE__*/ (0,jsx_runtime.jsx)(Page, (0,_object_spread_props._)((0,_object_spread._)({}, data, props, navigation.withControls ? filterControls(controls, [
+                    'theme',
+                    'onChangeTheme',
+                    'textSize',
+                    'onChangeTextSize',
+                    'wideFormat',
+                    'onChangeWideFormat',
+                    'showMiniToc',
+                    'onChangeShowMiniToc',
+                    'langs',
+                    'onChangeLang'
+                ]) : controls), {
+                    children: /*#__PURE__*/ (0,jsx_runtime.jsx)(ConstructorPage, (0,_object_spread._)({}, data.data))
+                }))
+            })
+        });
     }, [
         data,
         navigation,
         props,
         controls,
-        fullScreen
+        fullScreen,
+        Page
     ]);
     var content = useContent(data, CustomPage);
     var custom = (0,react.useMemo)(function() {
@@ -1470,9 +1429,6 @@ var withMdxInit = function(param) {
 
 
 
-function hasNavigation(data) {
-    return Boolean(data.toc.navigation);
-}
 function App(props) {
     var _analytics_gtm, _analytics_gtm1;
     var data = props.data, router = props.router, lang = props.lang, langs = props.langs, search = props.search, analytics = props.analytics, viewerInterface = props.viewerInterface;
@@ -1564,11 +1520,7 @@ function App(props) {
                             children: [
                                 /*#__PURE__*/ (0,jsx_runtime.jsx)(RenderBodyHooksContext/* .RenderBodyHooksContext.Provider */.Y.Provider, {
                                     value: renderHooks,
-                                    children: hasNavigation(data) ? /*#__PURE__*/ (0,jsx_runtime.jsx)(RichNavPage, {
-                                        data: data,
-                                        props: page,
-                                        controls: controls
-                                    }) : /*#__PURE__*/ (0,jsx_runtime.jsx)(LegacyNavPage, {
+                                    children: /*#__PURE__*/ (0,jsx_runtime.jsx)(App_Page_Page, {
                                         data: data,
                                         props: page,
                                         controls: controls