@gravity-ui/page-constructor 3.1.2 → 3.3.0

package/build/esm/editor/store/reducer.js

@@ -1,5 +1,4 @@
-import { getHeaderBlock, getOrderedBlocks } from '../../utils';
-import { addBlock, changeBlocksOrder, duplicateBlock, getNewBlockIndex } from './utils';
+import { addBlock, changeBlocksOrder, duplicateBlock, getErrorBoundaryState } from './utils';
 // actions
 export const SELECT_BLOCK = 'SELECT_BLOCK';
 export const DELETE_BLOCK = 'DELETE_BLOCK';
@@ -7,47 +6,31 @@ export const COPY_BLOCK = 'COPY_BLOCK';
 export const ADD_BLOCK = 'ADD_BLOCK';
 export const SET_REGION = 'SET_REGION';
 export const ORDER_BLOCK = 'ORDER_BLOCK';
+export const UPDATE_CONTENT = 'UPDATE_CONTENT';
 // reducer
-export const getReducer = (headerBlockTypes) => (state, action) => {
+export const reducer = (state, action) => {
     const { content } = state;
-    const header = getHeaderBlock(content.blocks, headerBlockTypes);
-    const orderedBlocks = getOrderedBlocks(content.blocks, headerBlockTypes);
-    const withHeader = (blocks) => [header, ...blocks].filter(Boolean);
-    const getNewState = (blocks, activeBlockId) => (Object.assign(Object.assign({}, state), { content: Object.assign(Object.assign({}, content), { blocks }), activeBlockId, orderedBlocksCount: orderedBlocks.length }));
+    const getNewState = (blocks, activeBlockIndex) => (Object.assign(Object.assign({}, state), { content: Object.assign(Object.assign({}, content), { blocks }), activeBlockIndex }));
     switch (action.type) {
+        case UPDATE_CONTENT:
+            return Object.assign(Object.assign({}, state), { content: action.payload, errorBoundaryState: getErrorBoundaryState(state.errorBoundaryState) });
         case SELECT_BLOCK:
-            return getNewState(content.blocks, action.payload);
+            return Object.assign(Object.assign({}, state), { activeBlockIndex: action.payload });
         case DELETE_BLOCK: {
             const blockId = action.payload;
-            return getNewState(typeof blockId === 'string'
-                ? content.blocks.filter(({ type }) => type !== blockId)
-                : withHeader(orderedBlocks.filter((_block, index) => index !== blockId)), -1);
+            return getNewState(content.blocks.filter((_block, index) => index !== blockId), -1);
         }
         case COPY_BLOCK: {
             const index = action.payload;
-            return getNewState(withHeader(duplicateBlock(orderedBlocks, index)), index + 1);
+            return getNewState(duplicateBlock(content.blocks, index), index + 1);
         }
         case ADD_BLOCK: {
-            let blocks;
-            let activeBlockId;
-            const block = action.payload;
-            if (headerBlockTypes.includes(block.type)) {
-                blocks = header ? blocks : [block, ...orderedBlocks];
-                activeBlockId = block.type;
-            }
-            else {
-                const newBlockIndex = getNewBlockIndex(state.activeBlockId, orderedBlocks.length);
-                blocks = withHeader(addBlock(orderedBlocks, block, newBlockIndex));
-                activeBlockId = newBlockIndex;
-            }
-            if (blocks) {
-                return getNewState(blocks, activeBlockId);
-            }
-            return state;
+            const { block, index } = action.payload;
+            return getNewState(addBlock(content.blocks, block, index), index);
         }
         case ORDER_BLOCK: {
             const { oldIndex, newIndex } = action.payload;
-            return getNewState(withHeader(changeBlocksOrder(orderedBlocks, oldIndex, newIndex)), newIndex);
+            return getNewState(changeBlocksOrder(content.blocks, oldIndex, newIndex), newIndex);
         }
         default:
             return state;

package/build/esm/editor/store/utils.d.ts

@@ -10,3 +10,4 @@ export declare const addEditorProps: (content: PageContent) => {
     menu?: import("../../models").Menu | undefined;
     background?: import("../../models").ThemedMediaProps | undefined;
 };
+export declare const getErrorBoundaryState: (prevState: number) => number;

package/build/esm/editor/store/utils.js

@@ -24,3 +24,4 @@ export const addBlock = (array, block, index) => {
 export const addEditorProps = (content) => {
     return Object.assign(Object.assign({}, content), { animated: false });
 };
+export const getErrorBoundaryState = (prevState) => prevState === Number.MAX_SAFE_INTEGER ? 0 : prevState + 1;

package/build/esm/editor/types/index.d.ts

@@ -1,17 +1,19 @@
 /// <reference types="react" />
 import { PageConstructorProps } from '../../containers/PageConstructor';
-import { BlockDecoratorProps, PageData } from '../../models';
+import { BlockDecorationProps, PageContent } from '../../models';
+import { SchemaCustomConfig } from '../../schema';
+import { EditBlockActions } from '../components/EditBlock/EditBlock';
 export type EditorBlockId = number | string;
 export interface EditorProps extends Required<Pick<PageConstructorProps, 'content'>>, Partial<Omit<PageConstructorProps, 'content'>> {
     children: (props: Partial<PageConstructorProps>) => React.ReactNode;
-    onChange?: (data: PageData) => void;
+    onChange?: (data: PageContent) => void;
+    customSchema?: SchemaCustomConfig;
 }
 export interface EditBlockEditorProps {
-    activeBlockId: EditorBlockId;
-    orderedBlocksCount: number;
-    onSelect: (index: EditorBlockId) => void;
-    onDelete: (index: EditorBlockId) => void;
-    onCopy: (index: number) => void;
-    onOrderChange: (index: number, newIndex: number) => void;
+    isActive?: boolean;
+    onSelect: () => void;
+    actions: EditBlockActions;
+}
+export interface EditBlockProps extends EditBlockEditorProps, BlockDecorationProps {
+    isHeader?: boolean;
 }
-export type EditBlockProps = EditBlockEditorProps & BlockDecoratorProps;

package/build/esm/editor/utils/index.d.ts

@@ -1,11 +1,12 @@
-import { BlockDecorator, CustomConfig } from '../../models';
+import { BlockDecorationProps, BlockDecorator, CustomConfig } from '../../models';
 export declare const formatBlockName: (name: string) => string;
-export declare const addCustomDecorator: (decorator: BlockDecorator, custom?: CustomConfig) => {
+export declare const addCustomDecorator: (decorators: BlockDecorator[], custom?: CustomConfig) => {
     decorators: {
-        block: ((props: import("../../models").BlockDecoratorProps) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>)[];
+        block: ((props: BlockDecorationProps) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>)[];
     };
     blocks?: import("../../models").CustomItems | undefined;
     subBlocks?: import("../../models").CustomItems | undefined;
     headers?: import("../../models").CustomItems | undefined;
     loadable?: import("../../models").LoadableConfig | undefined;
 };
+export declare const getBlockId: ({ index, type }: BlockDecorationProps) => string;

package/build/esm/editor/utils/index.js

@@ -1,6 +1,7 @@
 import _ from 'lodash';
 export const formatBlockName = (name) => _.capitalize(name).replace(/(block|-)/g, ' ');
-export const addCustomDecorator = (decorator, custom = {}) => {
-    const decorators = custom.decorators || {};
-    return Object.assign(Object.assign({}, custom), { decorators: Object.assign(Object.assign({}, decorators), { block: [...(decorators.block || []), decorator] }) });
+export const addCustomDecorator = (decorators, custom = {}) => {
+    const customDecorators = custom.decorators || {};
+    return Object.assign(Object.assign({}, custom), { decorators: Object.assign(Object.assign({}, customDecorators), { block: [...(customDecorators.block || []), ...decorators] }) });
 };
+export const getBlockId = ({ index, type }) => `${type}${index === undefined ? '' : `-${index}`}`;

package/build/esm/grid/Col/Col.d.ts

@@ -7,4 +7,4 @@ export interface GridColumnProps extends GridColumnClassParams, Refable<HTMLDivE
     dataQa?: string;
     children?: React.ReactNode;
 }
-export declare const Col: React.ForwardRefExoticComponent<Pick<WithChildren<GridColumnProps>, "style" | "children" | "className" | "reset" | "visible" | "sizes" | "offsets" | "orders" | "hidden" | "alignSelf" | "justifyContent" | "dataQa"> & React.RefAttributes<HTMLDivElement>>;
+export declare const Col: React.ForwardRefExoticComponent<Pick<WithChildren<GridColumnProps>, "style" | "children" | "className" | "visible" | "reset" | "sizes" | "offsets" | "orders" | "hidden" | "alignSelf" | "justifyContent" | "dataQa"> & React.RefAttributes<HTMLDivElement>>;

package/build/esm/models/constructor-items/blocks.d.ts

@@ -30,6 +30,7 @@ export interface Childable {
     children?: SubBlock[];
 }
 export interface BlockBaseProps {
+    type: BlockType;
     index?: number;
     anchor?: AnchorProps;
     visible?: GridColumnSize;
@@ -244,14 +245,18 @@ export interface IconsBlockProps {
         src: string;
     }[];
 }
-export interface ContentLayoutBlockProps {
-    properties?: {
-        size?: ContentSize;
-        background?: BackgroundImageProps;
-        centered?: boolean;
-        theme?: ContentTheme;
-        textWidth?: ContentTextSize;
-    };
+interface ContentLayoutBlockParams {
+    size?: ContentSize;
+    background?: BackgroundImageProps;
+    centered?: boolean;
+    theme?: ContentTheme;
+    textWidth?: ContentTextSize;
+}
+export interface ContentLayoutBlockProps extends ContentLayoutBlockParams {
+    /**
+     * @deprecated Use params on top level instead
+     */
+    properties?: ContentLayoutBlockParams;
     textContent: ContentBlockProps;
     fileContent?: FileLinkProps[];
 }

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

@@ -1,5 +1,5 @@
 import React, { PropsWithChildren } from 'react';
-import { Animatable, Block, BlockDecoratorProps, ConstructorItem, ThemedMediaProps, WithChildren } from './';
+import { Animatable, Block, BlockDecorationProps, ConstructorItem, ThemedMediaProps, WithChildren } from './';
 export interface PageData {
     content: PageContent;
 }
@@ -41,7 +41,7 @@ export interface CustomConfig {
     headers?: CustomItems;
     loadable?: LoadableConfig;
     decorators?: {
-        block?: ((props: BlockDecoratorProps) => React.ReactElement)[];
+        block?: ((props: BlockDecorationProps) => React.ReactElement)[];
     };
 }
 export {};

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

@@ -1,9 +1,4 @@
 import { PropsWithChildren } from 'react';
-export interface BlockDecorationProps extends PropsWithChildren {
-    id: string | number;
-}
-export interface BlockDecoratorProps extends PropsWithChildren {
-    id: string | number;
-    isHeader?: boolean;
-}
-export type BlockDecorator = (props: BlockDecoratorProps) => React.ReactElement;
+import { BlockBaseProps } from './constructor-items';
+export type BlockDecorationProps = Pick<BlockBaseProps, 'index' | 'type'> & PropsWithChildren;
+export type BlockDecorator = (props: BlockDecorationProps) => React.ReactElement;

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

@@ -63,6 +63,7 @@ export interface HeaderData {
     leftItems: NavigationItemModel[];
     rightItems?: NavigationItemModel[];
     iconSize?: number;
+    withBorder?: boolean;
 }
 export interface FooterColumn {
     title: string;

package/build/esm/navigation/components/Header/Header.css

@@ -9,6 +9,8 @@ unpredictable css rules order in build */
   align-items: center;
   height: var(--header-height);
   background-color: var(--yc-color-base-background);
+}
+.pc-header_with-border {
   box-shadow: inset 0 -1px 0 var(--yc-color-line-generic);
 }
 .pc-header__wrapper {

package/build/esm/navigation/components/Header/Header.js

@@ -1,4 +1,5 @@
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import _ from 'lodash';
 import Control from '../../../components/Control/Control';
 import OutsideClick from '../../../components/OutsideClick/OutsideClick';
 import { Col, Grid, Row } from '../../../grid';
@@ -27,9 +28,10 @@ const iconSizeKey = 'iconSize';
 const isButtonItem = (item) => item.type === NavigationItemType.Button;
 const isDropdownItem = (item) => item.type === NavigationItemType.Dropdown;
 export const Header = ({ data, logo }) => {
-    const { leftItems, rightItems, iconSize = 20 } = data;
+    const { leftItems, rightItems, iconSize = 20, withBorder = false } = data;
     const [isSidebarOpened, setIsSidebarOpened] = useState(false);
-    const [activeItemId, setactiveItemId] = useState(undefined);
+    const [activeItemId, setActiveItemId] = useState(undefined);
+    const [showBorder, setShowBorder] = useState(withBorder);
     const getNavigationItemWithIconSize = useCallback((item) => {
         const newItem = Object.assign({}, item);
         if ('items' in newItem && isDropdownItem(newItem)) {
@@ -43,7 +45,7 @@ export const Header = ({ data, logo }) => {
     const leftItemsWithIconSize = useMemo(() => leftItems.map(getNavigationItemWithIconSize), [getNavigationItemWithIconSize, leftItems]);
     const rightItemsWithIconSize = useMemo(() => rightItems === null || rightItems === void 0 ? void 0 : rightItems.map(getNavigationItemWithIconSize), [getNavigationItemWithIconSize, rightItems]);
     const onActiveItemChange = useCallback((id) => {
-        setactiveItemId(id);
+        setActiveItemId(id);
     }, []);
     const hidePopup = useCallback(() => {
         onActiveItemChange();
@@ -54,7 +56,16 @@ export const Header = ({ data, logo }) => {
     const hideSidebar = useCallback(() => {
         setIsSidebarOpened(false);
     }, []);
-    return (React.createElement(Grid, { className: b() },
+    useEffect(() => {
+        const showBorderOnScroll = () => {
+            if (!showBorder) {
+                setShowBorder(window.scrollY > 0);
+            }
+        };
+        window.addEventListener('scroll', _.debounce(showBorderOnScroll, 20), { passive: true });
+        return () => window.removeEventListener('scroll', _.debounce(showBorderOnScroll, 20));
+    });
+    return (React.createElement(Grid, { className: b({ 'with-border': showBorder }) },
         React.createElement(Row, null,
             React.createElement(Col, null,
                 React.createElement("header", { className: b('wrapper') },

package/build/esm/navigation/schema.d.ts

@@ -14,6 +14,7 @@ export declare const LogoProps: {
             } | {
                 type: string;
                 pattern: string;
+                optionName: string;
             })[];
         };
         text: {