@gravity-ui/page-constructor 1.10.8 → 1.11.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (13) hide show
  1. package/CHANGELOG.md +11 -0
  2. package/build/cjs/components/Link/Link.js +5 -5
  3. package/build/cjs/models/navigation.d.ts +3 -1
  4. package/build/cjs/navigation/components/Header/Header.d.ts +2 -2
  5. package/build/cjs/navigation/components/Logo/Logo.d.ts +3 -3
  6. package/build/cjs/navigation/components/Logo/Logo.js +10 -6
  7. package/build/esm/components/Link/Link.js +5 -5
  8. package/build/esm/models/navigation.d.ts +3 -1
  9. package/build/esm/navigation/components/Header/Header.d.ts +2 -2
  10. package/build/esm/navigation/components/Logo/Logo.d.ts +3 -3
  11. package/build/esm/navigation/components/Logo/Logo.js +11 -7
  12. package/package.json +1 -1
  13. package/server/models/navigation.d.ts +3 -1
package/CHANGELOG.md CHANGED
@@ -1,5 +1,16 @@
1
1
  # Changelog
2
2
 
3
+ ## [1.11.0](https://github.com/gravity-ui/page-constructor/compare/v1.10.8...v1.11.0) (2023-01-09)
4
+
5
+ ### Features
6
+
7
+ * **Navigation:** add logo dark theme support ([#97](https://github.com/gravity-ui/page-constructor/pull/97)) ([7e4e7bd](https://github.com/gravity-ui/page-constructor/commit/7e4e7bd6fb92fded7a38538f1da0c9f0e14cccb1))
8
+
9
+ ### Bug Fixes
10
+
11
+ * link children align ([#103](https://github.com/gravity-ui/page-constructor/issues/103)) ([07eee68](https://github.com/gravity-ui/page-constructor/commit/07eee6828de60a66e8ae371030c67adc50c7ff8d))
12
+
13
+
3
14
  ## [1.10.8](https://github.com/gravity-ui/page-constructor/compare/v1.10.7...v1.10.8) (2023-01-09)
4
15
 
5
16
 
package/build/cjs/components/Link/Link.js CHANGED
@@ -43,11 +43,11 @@ const LinkBlock = (props) => {
43
43
  return (react_1.default.createElement(FileLink_1.default, { text: children || text, href: href, type: "horizontal", textSize: textSize, onClick: onClick }));
44
44
  case 'normal': {
45
45
  const linkProps = (0, utils_1.getLinkProps)(url, hostname, target);
46
- return (react_1.default.createElement("a", Object.assign({ className: b('link', { theme: colorTheme, 'has-arrow': arrow }), href: href, onClick: onClick }, linkProps),
47
- react_1.default.createElement("span", { className: b('content') }, children || text),
48
- arrow && (react_1.default.createElement(react_1.Fragment, null,
49
- WORD_JOINER_SYM,
50
- react_1.default.createElement(uikit_1.Icon, { className: b('arrow'), data: icons_1.Chevron, size: getArrowSize(textSize) })))));
46
+ const content = children || text;
47
+ return (react_1.default.createElement("a", Object.assign({ className: b('link', { theme: colorTheme, 'has-arrow': arrow }), href: href, onClick: onClick }, linkProps), arrow ? (react_1.default.createElement(react_1.Fragment, null,
48
+ react_1.default.createElement("span", { className: b('content') }, content),
49
+ WORD_JOINER_SYM,
50
+ react_1.default.createElement(uikit_1.Icon, { className: b('arrow'), data: icons_1.Chevron, size: getArrowSize(textSize) }))) : (content)));
51
51
  }
52
52
  default:
53
53
  return null;
package/build/cjs/models/navigation.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { ThemeSupporting } from '../utils';
1
2
  import { ImageProps, ButtonProps } from './constructor-items';
2
3
  export declare enum NavigationItemType {
3
4
  Link = "link",
@@ -38,6 +39,7 @@ export interface NavigationLogoData {
38
39
  text?: string;
39
40
  url?: string;
40
41
  }
42
+ export type ThemedNavigationLogoData = NavigationLogoData & ThemeSupporting<NavigationLogoData>;
41
43
  export interface HeaderData {
42
44
  leftItems: NavigationItemModel[];
43
45
  rightItems?: NavigationItemModel[];
@@ -56,7 +58,7 @@ export interface FooterData {
56
58
  underline?: FooterUnderline;
57
59
  }
58
60
  export interface NavigationData {
59
- logo: NavigationLogoData;
61
+ logo: ThemedNavigationLogoData;
60
62
  header: HeaderData;
61
63
  footer?: FooterData;
62
64
  }
package/build/cjs/navigation/components/Header/Header.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
- import { HeaderData, NavigationLogoData } from '../../../models';
2
+ import { HeaderData, ThemedNavigationLogoData } from '../../../models';
3
3
  export interface HeaderProps {
4
- logo: NavigationLogoData;
4
+ logo: ThemedNavigationLogoData;
5
5
  data: HeaderData;
6
6
  }
7
7
  export declare const Header: React.FC<HeaderProps>;
package/build/cjs/navigation/components/Logo/Logo.d.ts CHANGED
@@ -1,7 +1,7 @@
1
1
  import React from 'react';
2
- import { NavigationLogoData } from '../../../models';
3
- export interface LogoProps extends NavigationLogoData {
2
+ import { ThemedNavigationLogoData } from '../../../models';
3
+ export type LogoProps = ThemedNavigationLogoData & {
4
4
  className?: string;
5
- }
5
+ };
6
6
  declare const Logo: React.FC<LogoProps>;
7
7
  export default Logo;
package/build/cjs/navigation/components/Logo/Logo.js CHANGED
@@ -1,17 +1,21 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  const tslib_1 = require("tslib");
4
- const react_1 = tslib_1.__importDefault(require("react"));
4
+ const react_1 = tslib_1.__importStar(require("react"));
5
5
  const utils_1 = require("../../../utils");
6
6
  const RouterLink_1 = tslib_1.__importDefault(require("../../../components/RouterLink/RouterLink"));
7
7
  const utils_2 = require("../../../components/Media/Image/utils");
8
+ const ThemeValueContext_1 = require("../../../context/theme/ThemeValueContext");
8
9
  const components_1 = require("../../../components");
9
10
  const b = (0, utils_1.block)('logo');
10
- const Logo = ({ icon, text, className }) => {
11
- const imageData = (0, utils_2.getMediaImage)(icon);
12
- return (react_1.default.createElement(RouterLink_1.default, { href: "/", passHref: true },
13
- react_1.default.createElement("div", { className: b(null, className) },
11
+ const Logo = (props) => {
12
+ const { themeValue: theme } = (0, react_1.useContext)(ThemeValueContext_1.ThemeValueContext);
13
+ const themedLogoProps = (0, utils_1.getThemedValue)(props, theme) || props;
14
+ const imageData = (0, utils_2.getMediaImage)(themedLogoProps.icon || props.icon);
15
+ const textData = themedLogoProps.text || props.text;
16
+ return (react_1.default.createElement(RouterLink_1.default, { href: themedLogoProps.url || props.url || '/', passHref: true },
17
+ react_1.default.createElement("div", { className: b(null, props.className) },
14
18
  imageData && react_1.default.createElement(components_1.Image, Object.assign({ className: b('icon') }, imageData)),
15
- react_1.default.createElement("span", { className: b('text') }, text))));
19
+ react_1.default.createElement("span", { className: b('text') }, textData))));
16
20
  };
17
21
  exports.default = Logo;
package/build/esm/components/Link/Link.js CHANGED
@@ -41,11 +41,11 @@ const LinkBlock = (props) => {
41
41
  return (React.createElement(FileLink, { text: children || text, href: href, type: "horizontal", textSize: textSize, onClick: onClick }));
42
42
  case 'normal': {
43
43
  const linkProps = getLinkProps(url, hostname, target);
44
- return (React.createElement("a", Object.assign({ className: b('link', { theme: colorTheme, 'has-arrow': arrow }), href: href, onClick: onClick }, linkProps),
45
- React.createElement("span", { className: b('content') }, children || text),
46
- arrow && (React.createElement(Fragment, null,
47
- WORD_JOINER_SYM,
48
- React.createElement(Icon, { className: b('arrow'), data: Chevron, size: getArrowSize(textSize) })))));
44
+ const content = children || text;
45
+ return (React.createElement("a", Object.assign({ className: b('link', { theme: colorTheme, 'has-arrow': arrow }), href: href, onClick: onClick }, linkProps), arrow ? (React.createElement(Fragment, null,
46
+ React.createElement("span", { className: b('content') }, content),
47
+ WORD_JOINER_SYM,
48
+ React.createElement(Icon, { className: b('arrow'), data: Chevron, size: getArrowSize(textSize) }))) : (content)));
49
49
  }
50
50
  default:
51
51
  return null;
package/build/esm/models/navigation.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { ThemeSupporting } from '../utils';
1
2
  import { ImageProps, ButtonProps } from './constructor-items';
2
3
  export declare enum NavigationItemType {
3
4
  Link = "link",
@@ -38,6 +39,7 @@ export interface NavigationLogoData {
38
39
  text?: string;
39
40
  url?: string;
40
41
  }
42
+ export type ThemedNavigationLogoData = NavigationLogoData & ThemeSupporting<NavigationLogoData>;
41
43
  export interface HeaderData {
42
44
  leftItems: NavigationItemModel[];
43
45
  rightItems?: NavigationItemModel[];
@@ -56,7 +58,7 @@ export interface FooterData {
56
58
  underline?: FooterUnderline;
57
59
  }
58
60
  export interface NavigationData {
59
- logo: NavigationLogoData;
61
+ logo: ThemedNavigationLogoData;
60
62
  header: HeaderData;
61
63
  footer?: FooterData;
62
64
  }
package/build/esm/navigation/components/Header/Header.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import React from 'react';
2
- import { HeaderData, NavigationLogoData } from '../../../models';
2
+ import { HeaderData, ThemedNavigationLogoData } from '../../../models';
3
3
  import './Header.css';
4
4
  export interface HeaderProps {
5
- logo: NavigationLogoData;
5
+ logo: ThemedNavigationLogoData;
6
6
  data: HeaderData;
7
7
  }
8
8
  export declare const Header: React.FC<HeaderProps>;
package/build/esm/navigation/components/Logo/Logo.d.ts CHANGED
@@ -1,8 +1,8 @@
1
1
  import React from 'react';
2
- import { NavigationLogoData } from '../../../models';
2
+ import { ThemedNavigationLogoData } from '../../../models';
3
3
  import './Logo.css';
4
- export interface LogoProps extends NavigationLogoData {
4
+ export type LogoProps = ThemedNavigationLogoData & {
5
5
  className?: string;
6
- }
6
+ };
7
7
  declare const Logo: React.FC<LogoProps>;
8
8
  export default Logo;
package/build/esm/navigation/components/Logo/Logo.js CHANGED
@@ -1,15 +1,19 @@
1
- import React from 'react';
2
- import { block } from '../../../utils';
1
+ import React, { useContext } from 'react';
2
+ import { block, getThemedValue } from '../../../utils';
3
3
  import RouterLink from '../../../components/RouterLink/RouterLink';
4
4
  import { getMediaImage } from '../../../components/Media/Image/utils';
5
+ import { ThemeValueContext } from '../../../context/theme/ThemeValueContext';
5
6
  import { Image } from '../../../components';
6
7
  import './Logo.css';
7
8
  const b = block('logo');
8
- const Logo = ({ icon, text, className }) => {
9
- const imageData = getMediaImage(icon);
10
- return (React.createElement(RouterLink, { href: "/", passHref: true },
11
- React.createElement("div", { className: b(null, className) },
9
+ const Logo = (props) => {
10
+ const { themeValue: theme } = useContext(ThemeValueContext);
11
+ const themedLogoProps = getThemedValue(props, theme) || props;
12
+ const imageData = getMediaImage(themedLogoProps.icon || props.icon);
13
+ const textData = themedLogoProps.text || props.text;
14
+ return (React.createElement(RouterLink, { href: themedLogoProps.url || props.url || '/', passHref: true },
15
+ React.createElement("div", { className: b(null, props.className) },
12
16
  imageData && React.createElement(Image, Object.assign({ className: b('icon') }, imageData)),
13
- React.createElement("span", { className: b('text') }, text))));
17
+ React.createElement("span", { className: b('text') }, textData))));
14
18
  };
15
19
  export default Logo;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/page-constructor",
3
- "version": "1.10.8",
3
+ "version": "1.11.0",
4
4
  "description": "Gravity UI Page Constructor",
5
5
  "license": "MIT",
6
6
  "repository": {
package/server/models/navigation.d.ts CHANGED
@@ -1,3 +1,4 @@
1
+ import { ThemeSupporting } from '../utils';
1
2
  import { ImageProps, ButtonProps } from './constructor-items';
2
3
  export declare enum NavigationItemType {
3
4
  Link = "link",
@@ -38,6 +39,7 @@ export interface NavigationLogoData {
38
39
  text?: string;
39
40
  url?: string;
40
41
  }
42
+ export type ThemedNavigationLogoData = NavigationLogoData & ThemeSupporting<NavigationLogoData>;
41
43
  export interface HeaderData {
42
44
  leftItems: NavigationItemModel[];
43
45
  rightItems?: NavigationItemModel[];
@@ -56,7 +58,7 @@ export interface FooterData {
56
58
  underline?: FooterUnderline;
57
59
  }
58
60
  export interface NavigationData {
59
- logo: NavigationLogoData;
61
+ logo: ThemedNavigationLogoData;
60
62
  header: HeaderData;
61
63
  footer?: FooterData;
62
64
  }