@gravity-ui/page-constructor 2.2.2-alpha.1 → 2.3.1

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.
package/CHANGELOG.md CHANGED
@@ -1,22 +1,18 @@
1
1
  # Changelog
2
2
 
3
- ## [2.2.2-alpha.1](https://github.com/gravity-ui/page-constructor/compare/v2.2.1...v2.2.2-alpha.1) (2023-04-03)
3
+ ## [2.3.1](https://github.com/gravity-ui/page-constructor/compare/v2.3.0...v2.3.1) (2023-04-03)
4
4
 
5
5
 
6
6
  ### Bug Fixes
7
7
 
8
- * add default branch ([d658348](https://github.com/gravity-ui/page-constructor/commit/d65834859ad7c93904145a20fc41b42bec6eaaec))
9
- * add skip-release ([4691f27](https://github.com/gravity-ui/page-constructor/commit/4691f278b022f9994e70c55a1552b20043fedeaf))
10
- * add specific default branch ([a10c49c](https://github.com/gravity-ui/page-constructor/commit/a10c49c1b249e19f719e49841a5c6538b3e0d69b))
11
- * release ([6b60092](https://github.com/gravity-ui/page-constructor/commit/6b600920dd1212dc4dafea5d1a3fccedf2424ce5))
12
- * remove default branch ([b1e3ce3](https://github.com/gravity-ui/page-constructor/commit/b1e3ce3d23a170d43b9f06147f674fa31cd98616))
13
- * remove skip-release ([5852d8e](https://github.com/gravity-ui/page-constructor/commit/5852d8ece6af51ec7bd91fd8585c5a0a3b91358a))
8
+ * **validator:** add FilterBlock to schema validators ([#270](https://github.com/gravity-ui/page-constructor/issues/270)) ([2c344a8](https://github.com/gravity-ui/page-constructor/commit/2c344a853d8d91b897423f8f46c191a5e7bfc8c7))
14
9
 
10
+ ## [2.3.0](https://github.com/gravity-ui/page-constructor/compare/v2.2.1...v2.3.0) (2023-04-03)
15
11
 
16
- ### chore
17
12
 
18
- * bump release ([32bc403](https://github.com/gravity-ui/page-constructor/commit/32bc40397ac0818c52364d8a6f1e6906eb34845f))
19
- * bump release ([d9132e6](https://github.com/gravity-ui/page-constructor/commit/d9132e61023c8437c31753c7ee91d80ffee3db3a))
13
+ ### Features
14
+
15
+ * add whitelist of image extenstions which can be compressed ([#215](https://github.com/gravity-ui/page-constructor/issues/215)) ([136034b](https://github.com/gravity-ui/page-constructor/commit/136034b642f7c044c00402cf2e0527ae8a099aeb))
20
16
 
21
17
  ## [2.2.1](https://github.com/gravity-ui/page-constructor/compare/v2.2.0...v2.2.1) (2023-03-30)
22
18
 
@@ -25,7 +25,7 @@ exports.FilterItemProps = {
25
25
  type: 'string',
26
26
  },
27
27
  },
28
- card: { $ref: 'self#/definitions/card' },
28
+ card: { $ref: 'self#/definitions/cards' },
29
29
  },
30
30
  };
31
31
  exports.FilterProps = {
@@ -4,6 +4,7 @@ const tslib_1 = require("tslib");
4
4
  const react_1 = tslib_1.__importStar(require("react"));
5
5
  const projectSettingsContext_1 = require("../../context/projectSettingsContext");
6
6
  const constants_1 = require("../../constants");
7
+ const imageCompress_1 = require("../../utils/imageCompress");
7
8
  const checkWebP = (src) => {
8
9
  return src.endsWith('.webp') ? src : src + '.webp';
9
10
  };
@@ -15,10 +16,9 @@ const Image = (props) => {
15
16
  if (!imageSrc) {
16
17
  return null;
17
18
  }
18
- // TODO: Temporary solution for .svg images
19
19
  const disableWebp = projectSettings.disableCompress ||
20
20
  disableCompress ||
21
- imageSrc.endsWith('.svg') ||
21
+ !(0, imageCompress_1.isCompressible)(imageSrc) ||
22
22
  imgLoadingError;
23
23
  return (react_1.default.createElement("picture", { className: containerClassName },
24
24
  mobile && (react_1.default.createElement(react_1.Fragment, null,
@@ -14,7 +14,7 @@ const getBlocksCases = (blocks) => {
14
14
  exports.getBlocksCases = getBlocksCases;
15
15
  function generateDefaultSchema(config) {
16
16
  const { cards = {}, blocks = {}, extensions = {} } = config !== null && config !== void 0 ? config : {};
17
- const blockValidators = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sub_blocks_1.Divider), blocks_1.ExtendedFeaturesBlock), blocks_1.PromoFeaturesBlock), blocks_1.SliderBlock), blocks_1.QuestionsBlock), blocks_1.HeaderBlock), blocks_1.BannerBlock), blocks_1.CompaniesBlock), blocks_1.MediaBlock), blocks_1.MapBlock), blocks_1.InfoBlock), blocks_1.SecurityBlock), blocks_1.TableBlock), blocks_1.TabsBlock), blocks_1.SimpleBlock), blocks_1.LinkTableBlock), blocks_1.PreviewBlock), blocks_1.HeaderSliderBlock), blocks_1.IconsBlock), blocks_1.CardLayoutBlock), blocks_1.ContentLayoutBlock), blocks_1.ShareBlock);
17
+ const blockValidators = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sub_blocks_1.Divider), blocks_1.ExtendedFeaturesBlock), blocks_1.PromoFeaturesBlock), blocks_1.SliderBlock), blocks_1.QuestionsBlock), blocks_1.HeaderBlock), blocks_1.BannerBlock), blocks_1.CompaniesBlock), blocks_1.MediaBlock), blocks_1.MapBlock), blocks_1.InfoBlock), blocks_1.SecurityBlock), blocks_1.TableBlock), blocks_1.TabsBlock), blocks_1.SimpleBlock), blocks_1.LinkTableBlock), blocks_1.PreviewBlock), blocks_1.HeaderSliderBlock), blocks_1.IconsBlock), blocks_1.CardLayoutBlock), blocks_1.ContentLayoutBlock), blocks_1.ShareBlock), blocks_1.FilterBlock);
18
18
  const cardValidators = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, sub_blocks_1.PartnerBlock), sub_blocks_1.MediaCardBlock), blocks_1.BannerCard), sub_blocks_1.PriceDetailedBlock), sub_blocks_1.TutorialCard), sub_blocks_1.BackgroundCard), sub_blocks_1.NewsCard), sub_blocks_1.CardWithImage), sub_blocks_1.Quote), sub_blocks_1.BasicCard);
19
19
  const constructorBlockSchemaNames = [
20
20
  'divider',
@@ -44,6 +44,7 @@ function generateDefaultSchema(config) {
44
44
  'card-layout-block',
45
45
  'content-layout-block',
46
46
  'share-block',
47
+ 'filter-block',
47
48
  ];
48
49
  const constructorCardSchemaNames = [
49
50
  'partner',
@@ -19,3 +19,4 @@ export * from '../../blocks/Icons/schema';
19
19
  export * from '../../blocks/CardLayout/schema';
20
20
  export * from '../../blocks/ContentLayout/schema';
21
21
  export * from '../../blocks/Share/schema';
22
+ export * from '../../blocks/FilterBlock/schema';
@@ -22,3 +22,4 @@ tslib_1.__exportStar(require("../../blocks/Icons/schema"), exports);
22
22
  tslib_1.__exportStar(require("../../blocks/CardLayout/schema"), exports);
23
23
  tslib_1.__exportStar(require("../../blocks/ContentLayout/schema"), exports);
24
24
  tslib_1.__exportStar(require("../../blocks/Share/schema"), exports);
25
+ tslib_1.__exportStar(require("../../blocks/FilterBlock/schema"), exports);
@@ -0,0 +1,6 @@
1
+ export declare enum AvailableForCompressExtension {
2
+ PNG = "png",
3
+ JPG = "jpg",
4
+ JPEG = "jpeg"
5
+ }
6
+ export declare const isCompressible: (fileName: string) => boolean;
@@ -0,0 +1,11 @@
1
+ "use strict";
2
+ Object.defineProperty(exports, "__esModule", { value: true });
3
+ exports.isCompressible = exports.AvailableForCompressExtension = void 0;
4
+ var AvailableForCompressExtension;
5
+ (function (AvailableForCompressExtension) {
6
+ AvailableForCompressExtension["PNG"] = "png";
7
+ AvailableForCompressExtension["JPG"] = "jpg";
8
+ AvailableForCompressExtension["JPEG"] = "jpeg";
9
+ })(AvailableForCompressExtension = exports.AvailableForCompressExtension || (exports.AvailableForCompressExtension = {}));
10
+ const isCompressible = (fileName) => Object.keys(AvailableForCompressExtension).some((ext) => fileName.endsWith(`.${ext}`));
11
+ exports.isCompressible = isCompressible;
@@ -22,7 +22,7 @@ export const FilterItemProps = {
22
22
  type: 'string',
23
23
  },
24
24
  },
25
- card: { $ref: 'self#/definitions/card' },
25
+ card: { $ref: 'self#/definitions/cards' },
26
26
  },
27
27
  };
28
28
  export const FilterProps = {
@@ -1,6 +1,7 @@
1
1
  import React, { useContext, useState, Fragment } from 'react';
2
2
  import { ProjectSettingsContext } from '../../context/projectSettingsContext';
3
3
  import { BREAKPOINTS } from '../../constants';
4
+ import { isCompressible } from '../../utils/imageCompress';
4
5
  const checkWebP = (src) => {
5
6
  return src.endsWith('.webp') ? src : src + '.webp';
6
7
  };
@@ -12,10 +13,9 @@ const Image = (props) => {
12
13
  if (!imageSrc) {
13
14
  return null;
14
15
  }
15
- // TODO: Temporary solution for .svg images
16
16
  const disableWebp = projectSettings.disableCompress ||
17
17
  disableCompress ||
18
- imageSrc.endsWith('.svg') ||
18
+ !isCompressible(imageSrc) ||
19
19
  imgLoadingError;
20
20
  return (React.createElement("picture", { className: containerClassName },
21
21
  mobile && (React.createElement(Fragment, null,
@@ -1,5 +1,5 @@
1
1
  export { validators } from './validators';
2
- import { TabsBlock, BannerCard, SliderBlock, ExtendedFeaturesBlock, HeaderBlock, BannerBlock, CompaniesBlock, MediaBlock, InfoBlock, QuestionsBlock, SecurityBlock, TableBlock, SimpleBlock, LinkTableBlock, PromoFeaturesBlock, PreviewBlock, ContentLayoutBlock, HeaderSliderBlock, IconsBlock, CardLayoutBlock, ShareBlock, MapBlock, } from './validators/blocks';
2
+ import { TabsBlock, BannerCard, SliderBlock, ExtendedFeaturesBlock, HeaderBlock, BannerBlock, CompaniesBlock, MediaBlock, InfoBlock, QuestionsBlock, SecurityBlock, TableBlock, SimpleBlock, LinkTableBlock, PromoFeaturesBlock, PreviewBlock, ContentLayoutBlock, HeaderSliderBlock, IconsBlock, CardLayoutBlock, ShareBlock, MapBlock, FilterBlock, } from './validators/blocks';
3
3
  import { PartnerBlock, MediaCardBlock, TutorialCard, BackgroundCard, NewsCard, CardWithImage, PriceDetailedBlock, Quote, Divider, BasicCard, } from './validators/sub-blocks';
4
4
  import { AnimatableProps, BackgroundProps, MenuProps, withTheme } from './validators/common';
5
5
  import { filteredItem } from './validators/utils';
@@ -9,7 +9,7 @@ export const getBlocksCases = (blocks) => {
9
9
  };
10
10
  export function generateDefaultSchema(config) {
11
11
  const { cards = {}, blocks = {}, extensions = {} } = config !== null && config !== void 0 ? config : {};
12
- const blockValidators = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Divider), ExtendedFeaturesBlock), PromoFeaturesBlock), SliderBlock), QuestionsBlock), HeaderBlock), BannerBlock), CompaniesBlock), MediaBlock), MapBlock), InfoBlock), SecurityBlock), TableBlock), TabsBlock), SimpleBlock), LinkTableBlock), PreviewBlock), HeaderSliderBlock), IconsBlock), CardLayoutBlock), ContentLayoutBlock), ShareBlock);
12
+ const blockValidators = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Divider), ExtendedFeaturesBlock), PromoFeaturesBlock), SliderBlock), QuestionsBlock), HeaderBlock), BannerBlock), CompaniesBlock), MediaBlock), MapBlock), InfoBlock), SecurityBlock), TableBlock), TabsBlock), SimpleBlock), LinkTableBlock), PreviewBlock), HeaderSliderBlock), IconsBlock), CardLayoutBlock), ContentLayoutBlock), ShareBlock), FilterBlock);
13
13
  const cardValidators = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, PartnerBlock), MediaCardBlock), BannerCard), PriceDetailedBlock), TutorialCard), BackgroundCard), NewsCard), CardWithImage), Quote), BasicCard);
14
14
  const constructorBlockSchemaNames = [
15
15
  'divider',
@@ -39,6 +39,7 @@ export function generateDefaultSchema(config) {
39
39
  'card-layout-block',
40
40
  'content-layout-block',
41
41
  'share-block',
42
+ 'filter-block',
42
43
  ];
43
44
  const constructorCardSchemaNames = [
44
45
  'partner',
@@ -19,3 +19,4 @@ export * from '../../blocks/Icons/schema';
19
19
  export * from '../../blocks/CardLayout/schema';
20
20
  export * from '../../blocks/ContentLayout/schema';
21
21
  export * from '../../blocks/Share/schema';
22
+ export * from '../../blocks/FilterBlock/schema';
@@ -19,3 +19,4 @@ export * from '../../blocks/Icons/schema';
19
19
  export * from '../../blocks/CardLayout/schema';
20
20
  export * from '../../blocks/ContentLayout/schema';
21
21
  export * from '../../blocks/Share/schema';
22
+ export * from '../../blocks/FilterBlock/schema';
@@ -0,0 +1,6 @@
1
+ export declare enum AvailableForCompressExtension {
2
+ PNG = "png",
3
+ JPG = "jpg",
4
+ JPEG = "jpeg"
5
+ }
6
+ export declare const isCompressible: (fileName: string) => boolean;
@@ -0,0 +1,7 @@
1
+ export var AvailableForCompressExtension;
2
+ (function (AvailableForCompressExtension) {
3
+ AvailableForCompressExtension["PNG"] = "png";
4
+ AvailableForCompressExtension["JPG"] = "jpg";
5
+ AvailableForCompressExtension["JPEG"] = "jpeg";
6
+ })(AvailableForCompressExtension || (AvailableForCompressExtension = {}));
7
+ export const isCompressible = (fileName) => Object.keys(AvailableForCompressExtension).some((ext) => fileName.endsWith(`.${ext}`));
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@gravity-ui/page-constructor",
3
- "version": "2.2.2-alpha.1",
3
+ "version": "2.3.1",
4
4
  "description": "Gravity UI Page Constructor",
5
5
  "license": "MIT",
6
6
  "repository": {