@brilo/base-blocks 0.1.55 → 0.1.56

package/build/blocks/core/basic-icon/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/core/basic-icon/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAIzD,OAAO,KAAK,EAAC,mBAAmB,EAAE,gBAAgB,EAAC,MAAM,SAAS,CAAA;AAElE,YAAY,EAAC,mBAAmB,EAAE,gBAAgB,EAAC,CAAA;AAEnD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAiCvG"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/core/basic-icon/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAKzD,OAAO,KAAK,EAAC,mBAAmB,EAAE,gBAAgB,EAAC,MAAM,SAAS,CAAA;AAElE,YAAY,EAAC,mBAAmB,EAAE,gBAAgB,EAAC,CAAA;AAEnD,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,gBAAgB,GAAG,kBAAkB,CAAC,mBAAmB,CAAC,CAiCvG"}

package/build/blocks/core/basic-icon/factory.js

@@ -1,3 +1,4 @@
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { DEFAULT_ALIGNMENTS, DEFAULT_ICON_BACKGROUND_SHAPES, DEFAULT_ICON_BACKGROUND_SIZE, DEFAULT_ICON_SIZE, ICON_TYPES } from './constants';
 import { createBasicIconEdit } from './edit';
@@ -32,7 +33,7 @@ export function createBasicIconBlock(options) {
                 },
             },
         },
-        edit: createBasicIconEdit(options),
+        edit: withObjectDefaults(createBasicIconEdit(options)),
         save: () => null,
     };
 }

package/build/blocks/faq/faq-group/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/faq/faq-group/factory.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAGzD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AAExC,OAAO,EAAoB,qBAAqB,EAAqB,MAAM,aAAa,CAAA;AAExF,OAAO,KAAK,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAA;AAEhE,YAAY,EAAC,kBAAkB,EAAE,eAAe,EAAC,CAAA;AAEjD,wBAAgB,mBAAmB,CAAC,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAClG,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,GACtC,kBAAkB,CAAC,kBAAkB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CA8CxE"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/faq/faq-group/factory.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAGzD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AAExC,OAAO,EAAoB,qBAAqB,EAAqB,MAAM,aAAa,CAAA;AAExF,OAAO,KAAK,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAA;AAEhE,YAAY,EAAC,kBAAkB,EAAE,eAAe,EAAC,CAAA;AAEjD,wBAAgB,mBAAmB,CAAC,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAClG,OAAO,EAAE,eAAe,CAAC,aAAa,CAAC,GACtC,kBAAkB,CAAC,kBAAkB,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CA8CxE"}

package/build/blocks/faq/faq-group/factory.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { InnerBlocks } from '@wordpress/block-editor';
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { ITEM_SPACING_ATTRIBUTE } from '../../../components/ItemSpacingControl';
 import { DEFAULT_SURFACE_SHADOWS, surfaceStyleAttribute } from '../../../components/SurfaceStyleControl';
@@ -46,7 +47,7 @@ export function createFaqGroupBlock(options) {
         icon: (_h = options.icon) !== null && _h !== void 0 ? _h : 'editor-help',
         supports: { html: false, customClassName: false },
         attributes,
-        edit: createFaqGroupEdit(options),
+        edit: withObjectDefaults(createFaqGroupEdit(options)),
         save: () => _jsx(InnerBlocks.Content, {}),
     };
 }

package/build/blocks/groups/banner-group/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/groups/banner-group/factory.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,SAAS,CAAA;AACrD,OAAO,EAAC,gBAAgB,EAAE,sBAAsB,EAAC,MAAM,aAAa,CAAA;AAEpE,OAAO,KAAK,EAAC,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAA;AAItE,YAAY,EAAC,qBAAqB,EAAE,kBAAkB,EAAC,CAAA;AAEvD,wBAAgB,sBAAsB,CACpC,SAAS,SAAS,WAAW,GAAG,OAAO,gBAAgB,EACvD,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAElE,OAAO,EAAE,kBAAkB,CAAC,SAAS,EAAE,cAAc,CAAC,GACrD,kBAAkB,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CA8C/F"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/groups/banner-group/factory.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,SAAS,CAAA;AACrD,OAAO,EAAC,gBAAgB,EAAE,sBAAsB,EAAC,MAAM,aAAa,CAAA;AAEpE,OAAO,KAAK,EAAC,qBAAqB,EAAE,kBAAkB,EAAC,MAAM,SAAS,CAAA;AAItE,YAAY,EAAC,qBAAqB,EAAE,kBAAkB,EAAC,CAAA;AAEvD,wBAAgB,sBAAsB,CACpC,SAAS,SAAS,WAAW,GAAG,OAAO,gBAAgB,EACvD,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAElE,OAAO,EAAE,kBAAkB,CAAC,SAAS,EAAE,cAAc,CAAC,GACrD,kBAAkB,CAAC,qBAAqB,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CA8C/F"}

package/build/blocks/groups/banner-group/factory.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { InnerBlocks } from '@wordpress/block-editor';
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { DEFAULT_VARIANTS, DEFAULT_HEADING_STYLES } from './constants';
 import { createBannerGroupEdit } from './edit';
@@ -48,7 +49,7 @@ export function createBannerGroupBlock(options) {
             backgroundColor: { type: 'string', default: '' },
             textColor: { type: 'string', default: '' },
         },
-        edit: createBannerGroupEdit(options),
+        edit: withObjectDefaults(createBannerGroupEdit(options)),
         save: () => _jsx(InnerBlocks.Content, {}),
     };
 }

package/build/blocks/groups/basic-header-group/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/groups/basic-header-group/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,SAAS,CAAA;AAClE,OAAO,EAAC,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAC,MAAM,aAAa,CAAA;AAG9E,OAAO,KAAK,EAAC,0BAA0B,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAA;AAEhF,YAAY,EAAC,0BAA0B,EAAE,uBAAuB,EAAC,CAAA;AAEjE,wBAAgB,2BAA2B,CACzC,OAAO,SAAS,WAAW,GAAG,OAAO,cAAc,EACnD,OAAO,SAAS,WAAW,GAAG,OAAO,cAAc,EACnD,WAAW,SAAS,WAAW,GAAG,OAAO,kBAAkB,EAE3D,OAAO,EAAE,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GAC9D,kBAAkB,CAAC,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CA6BhH"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/groups/basic-header-group/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAGzD,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAE,WAAW,EAAC,MAAM,SAAS,CAAA;AAClE,OAAO,EAAC,kBAAkB,EAAE,cAAc,EAAE,cAAc,EAAC,MAAM,aAAa,CAAA;AAG9E,OAAO,KAAK,EAAC,0BAA0B,EAAE,uBAAuB,EAAC,MAAM,SAAS,CAAA;AAEhF,YAAY,EAAC,0BAA0B,EAAE,uBAAuB,EAAC,CAAA;AAEjE,wBAAgB,2BAA2B,CACzC,OAAO,SAAS,WAAW,GAAG,OAAO,cAAc,EACnD,OAAO,SAAS,WAAW,GAAG,OAAO,cAAc,EACnD,WAAW,SAAS,WAAW,GAAG,OAAO,kBAAkB,EAE3D,OAAO,EAAE,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,WAAW,CAAC,GAC9D,kBAAkB,CAAC,0BAA0B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CA6BhH"}

package/build/blocks/groups/basic-header-group/factory.js

@@ -1,3 +1,4 @@
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { DEFAULT_ALIGNMENTS, DEFAULT_LEVELS, DEFAULT_STYLES } from './constants';
 import { createBasicHeaderGroupEdit } from './edit';
@@ -29,7 +30,7 @@ export function createBasicHeaderGroupBlock(options) {
                 enum: alignments.map((a) => a.value),
             },
         },
-        edit: createBasicHeaderGroupEdit(options),
+        edit: withObjectDefaults(createBasicHeaderGroupEdit(options)),
         save: () => null,
     };
 }

package/build/blocks/groups/text-and-media-group/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/groups/text-and-media-group/factory.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,cAAc,EAEf,MAAM,aAAa,CAAA;AAGpB,OAAO,KAAK,EAAC,2BAA2B,EAAE,wBAAwB,EAAC,MAAM,SAAS,CAAA;AAElF,YAAY,EAAC,2BAA2B,EAAE,wBAAwB,EAAC,CAAA;AAEnE,wBAAgB,4BAA4B,CAC1C,OAAO,SAAS,WAAW,GAAG,OAAO,cAAc,EACnD,eAAe,SAAS,WAAW,GAAG,OAAO,uBAAuB,EACpE,WAAW,SAAS,WAAW,GAAG,OAAO,mBAAmB,EAC5D,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAClE,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAChE,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAChE,eAAe,SAAS,WAAW,GAAG,OAAO,wBAAwB,EAErE,OAAO,EAAE,wBAAwB,CAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,CAAC,GACtI,kBAAkB,CACnB,2BAA2B,CACzB,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EACxB,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAChC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC5B,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC/B,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC9B,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC9B,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CACjC,CACF,CAiEA"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/groups/text-and-media-group/factory.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AACxC,OAAO,EACL,qBAAqB,EACrB,qBAAqB,EACrB,mBAAmB,EACnB,sBAAsB,EACtB,wBAAwB,EACxB,uBAAuB,EACvB,cAAc,EAEf,MAAM,aAAa,CAAA;AAGpB,OAAO,KAAK,EAAC,2BAA2B,EAAE,wBAAwB,EAAC,MAAM,SAAS,CAAA;AAElF,YAAY,EAAC,2BAA2B,EAAE,wBAAwB,EAAC,CAAA;AAEnE,wBAAgB,4BAA4B,CAC1C,OAAO,SAAS,WAAW,GAAG,OAAO,cAAc,EACnD,eAAe,SAAS,WAAW,GAAG,OAAO,uBAAuB,EACpE,WAAW,SAAS,WAAW,GAAG,OAAO,mBAAmB,EAC5D,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAClE,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAChE,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAChE,eAAe,SAAS,WAAW,GAAG,OAAO,wBAAwB,EAErE,OAAO,EAAE,wBAAwB,CAAC,OAAO,EAAE,eAAe,EAAE,WAAW,EAAE,cAAc,EAAE,aAAa,EAAE,aAAa,EAAE,eAAe,CAAC,GACtI,kBAAkB,CACnB,2BAA2B,CACzB,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EACxB,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAChC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC5B,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC/B,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC9B,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC9B,eAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CACjC,CACF,CAiEA"}

package/build/blocks/groups/text-and-media-group/factory.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { InnerBlocks } from '@wordpress/block-editor';
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { DEFAULT_CHIP_VARIANTS, DEFAULT_CONTENT_SIZES, DEFAULT_GRID_STYLES, DEFAULT_HEADING_STYLES, DEFAULT_IMAGE_CLIP_PATHS, DEFAULT_MEDIA_POSITIONS, DEFAULT_RATIOS, HEADING_LEVELS, } from './constants';
 import { createTextAndMediaGroupEdit } from './edit';
@@ -57,7 +58,7 @@ export function createTextAndMediaGroupBlock(options) {
             },
             content: { type: 'object', default: { size: (_t = (_d = contentSizes[1]) === null || _d === void 0 ? void 0 : _d.value) !== null && _t !== void 0 ? _t : contentSizes[0].value } },
         },
-        edit: createTextAndMediaGroupEdit(options),
+        edit: withObjectDefaults(createTextAndMediaGroupEdit(options)),
         save: () => _jsx(InnerBlocks.Content, {}),
     };
 }

package/build/blocks/map/map-group/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/map/map-group/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAGzD,OAAO,KAAK,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAA;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AACxC,OAAO,EAAC,sBAAsB,EAAmB,MAAM,wCAAwC,CAAA;AAI/F,YAAY,EAAC,kBAAkB,EAAE,eAAe,EAAC,CAAA;AAEjD,wBAAgB,mBAAmB,CAAC,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EACpG,OAAO,EAAE,eAAe,CAAC,cAAc,CAAC,GACvC,kBAAkB,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CA0DhE"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/map/map-group/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAIzD,OAAO,KAAK,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAA;AAEhE,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AACxC,OAAO,EAAC,sBAAsB,EAAmB,MAAM,wCAAwC,CAAA;AAI/F,YAAY,EAAC,kBAAkB,EAAE,eAAe,EAAC,CAAA;AAEjD,wBAAgB,mBAAmB,CAAC,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EACpG,OAAO,EAAE,eAAe,CAAC,cAAc,CAAC,GACvC,kBAAkB,CAAC,kBAAkB,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CA0DhE"}

package/build/blocks/map/map-group/factory.js

@@ -1,4 +1,5 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { createMapGroupEdit } from './edit';
 import { MAP_TYPES } from './constants';
@@ -60,7 +61,7 @@ export function createMapGroupBlock(options) {
                 default: '',
             },
         },
-        edit: createMapGroupEdit(options),
+        edit: withObjectDefaults(createMapGroupEdit(options)),
         save: () => _jsx(InnerBlocks.Content, {}),
     };
 }

package/build/blocks/newsletter/newsletter-form/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/newsletter/newsletter-form/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAIzD,OAAO,KAAK,EAAC,wBAAwB,EAAE,qBAAqB,EAAC,MAAM,SAAS,CAAA;AAE5E,YAAY,EAAC,wBAAwB,EAAE,qBAAqB,EAAC,CAAA;AAE7D,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,qBAAqB,GAAG,kBAAkB,CAAC,wBAAwB,CAAC,CAkDtH"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/newsletter/newsletter-form/factory.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAKzD,OAAO,KAAK,EAAC,wBAAwB,EAAE,qBAAqB,EAAC,MAAM,SAAS,CAAA;AAE5E,YAAY,EAAC,wBAAwB,EAAE,qBAAqB,EAAC,CAAA;AAE7D,wBAAgB,yBAAyB,CAAC,OAAO,EAAE,qBAAqB,GAAG,kBAAkB,CAAC,wBAAwB,CAAC,CAkDtH"}

package/build/blocks/newsletter/newsletter-form/factory.js

@@ -1,3 +1,4 @@
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { DEFAULT_HEADING_STYLES, NEWSLETTER_LEVELS } from './constants';
 import { createNewsletterFormEdit } from './edit';
@@ -48,7 +49,7 @@ export function createNewsletterFormBlock(options) {
                 },
             },
         },
-        edit: createNewsletterFormEdit(options),
+        edit: withObjectDefaults(createNewsletterFormEdit(options)),
         save: () => null,
     };
 }

package/build/blocks/text-and-form/text-and-form-text-column/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/text-and-form/text-and-form-text-column/factory.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AACxC,OAAO,EAAC,qBAAqB,EAAE,sBAAsB,EAAiB,MAAM,aAAa,CAAA;AAEzF,OAAO,KAAK,EAAC,+BAA+B,EAAE,4BAA4B,EAAC,MAAM,SAAS,CAAA;AAE1F,YAAY,EAAC,+BAA+B,EAAE,4BAA4B,EAAC,CAAA;AAE3E,wBAAgB,gCAAgC,CAC9C,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAClE,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAEhE,OAAO,EAAE,4BAA4B,CAAC,cAAc,EAAE,aAAa,CAAC,GACnE,kBAAkB,CAAC,+BAA+B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAyBtH"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/text-and-form/text-and-form-text-column/factory.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAEzD,OAAO,KAAK,EAAC,WAAW,EAAC,MAAM,SAAS,CAAA;AACxC,OAAO,EAAC,qBAAqB,EAAE,sBAAsB,EAAiB,MAAM,aAAa,CAAA;AAEzF,OAAO,KAAK,EAAC,+BAA+B,EAAE,4BAA4B,EAAC,MAAM,SAAS,CAAA;AAE1F,YAAY,EAAC,+BAA+B,EAAE,4BAA4B,EAAC,CAAA;AAE3E,wBAAgB,gCAAgC,CAC9C,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAClE,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAEhE,OAAO,EAAE,4BAA4B,CAAC,cAAc,EAAE,aAAa,CAAC,GACnE,kBAAkB,CAAC,+BAA+B,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAAE,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAyBtH"}

package/build/blocks/text-and-form/text-and-form-text-column/factory.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { InnerBlocks } from '@wordpress/block-editor';
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { DEFAULT_CONTENT_SIZES, DEFAULT_HEADING_STYLES, HEADING_LEVELS } from './constants';
 import { createTextAndFormTextColumnEdit } from './edit';
@@ -26,7 +27,7 @@ export function createTextAndFormTextColumnBlock(options) {
             },
             content: { type: 'object', default: { size: (_j = (_b = contentSizes[1]) === null || _b === void 0 ? void 0 : _b.value) !== null && _j !== void 0 ? _j : contentSizes[0].value } },
         },
-        edit: createTextAndFormTextColumnEdit(options),
+        edit: withObjectDefaults(createTextAndFormTextColumnEdit(options)),
         save: () => _jsx(InnerBlocks.Content, {}),
     };
 }

package/build/blocks/usp/usp-group/factory.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/usp/usp-group/factory.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAGzD,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,SAAS,CAAA;AACrD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,8BAA8B,EAG9B,eAAe,EAEhB,MAAM,aAAa,CAAA;AAGpB,OAAO,KAAK,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAA;AAEhE,YAAY,EAAC,kBAAkB,EAAE,eAAe,EAAC,CAAA;AAEjD,wBAAgB,mBAAmB,CACjC,QAAQ,SAAS,WAAW,GAAG,OAAO,eAAe,EACrD,WAAW,SAAS,WAAW,GAAG,OAAO,kBAAkB,EAC3D,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAClE,QAAQ,SAAS,WAAW,GAAG,OAAO,eAAe,EACrD,qBAAqB,SAAS,WAAW,GAAG,OAAO,8BAA8B,EACjF,WAAW,SAAS,WAAW,GAAG,OAAO,kBAAkB,EAC3D,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAEhE,OAAO,EAAE,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,qBAAqB,EAAE,WAAW,EAAE,aAAa,CAAC,GAC3H,kBAAkB,CACnB,kBAAkB,CAChB,QAAQ,CAAC,MAAM,CAAC,EAChB,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC5B,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EACzB,qBAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EACtC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC5B,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAC/B,CACF,CAkEA"}
+{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../../../../src/blocks/usp/usp-group/factory.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,kBAAkB,EAAC,MAAM,mBAAmB,CAAA;AAGzD,OAAO,KAAK,EAAC,WAAW,EAAE,WAAW,EAAC,MAAM,SAAS,CAAA;AACrD,OAAO,EACL,kBAAkB,EAClB,eAAe,EACf,qBAAqB,EACrB,kBAAkB,EAClB,sBAAsB,EACtB,8BAA8B,EAG9B,eAAe,EAEhB,MAAM,aAAa,CAAA;AAGpB,OAAO,KAAK,EAAC,kBAAkB,EAAE,eAAe,EAAC,MAAM,SAAS,CAAA;AAEhE,YAAY,EAAC,kBAAkB,EAAE,eAAe,EAAC,CAAA;AAEjD,wBAAgB,mBAAmB,CACjC,QAAQ,SAAS,WAAW,GAAG,OAAO,eAAe,EACrD,WAAW,SAAS,WAAW,GAAG,OAAO,kBAAkB,EAC3D,cAAc,SAAS,WAAW,GAAG,OAAO,sBAAsB,EAClE,QAAQ,SAAS,WAAW,GAAG,OAAO,eAAe,EACrD,qBAAqB,SAAS,WAAW,GAAG,OAAO,8BAA8B,EACjF,WAAW,SAAS,WAAW,GAAG,OAAO,kBAAkB,EAC3D,aAAa,SAAS,WAAW,GAAG,OAAO,qBAAqB,EAEhE,OAAO,EAAE,eAAe,CAAC,QAAQ,EAAE,WAAW,EAAE,cAAc,EAAE,QAAQ,EAAE,qBAAqB,EAAE,WAAW,EAAE,aAAa,CAAC,GAC3H,kBAAkB,CACnB,kBAAkB,CAChB,QAAQ,CAAC,MAAM,CAAC,EAChB,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC5B,cAAc,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EACzB,qBAAqB,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EACtC,WAAW,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAC5B,aAAa,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAC/B,CACF,CAkEA"}

package/build/blocks/usp/usp-group/factory.js

@@ -1,5 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { InnerBlocks } from '@wordpress/block-editor';
+import { withObjectDefaults } from '../../../utils/withObjectDefaults';
 import { __ } from '@wordpress/i18n';
 import { ITEM_SPACING_ATTRIBUTE } from '../../../components/ItemSpacingControl';
 import { DEFAULT_ALIGNMENTS, DEFAULT_COLUMNS, DEFAULT_CONTENT_SIZES, DEFAULT_DIRECTIONS, DEFAULT_HEADING_STYLES, DEFAULT_ICON_BACKGROUND_SHAPES, DEFAULT_ICON_BACKGROUND_SIZE, DEFAULT_ICON_SIZE, DEFAULT_SHADOWS, HEADING_LEVELS, } from './constants';
@@ -59,7 +60,7 @@ export function createUspGroupBlock(options) {
             },
             ...ITEM_SPACING_ATTRIBUTE,
         },
-        edit: createUspGroupEdit(options),
+        edit: withObjectDefaults(createUspGroupEdit(options)),
         save: () => _jsx(InnerBlocks.Content, {}),
     };
 }

package/build/utils/withObjectDefaults.d.ts

@@ -0,0 +1,12 @@
+import type { ComponentType } from 'react';
+type PlainObject = Record<string, unknown>;
+/**
+ * Block markup can carry partial object attributes (e.g. generated content) and WP does not deep-merge
+ * them with the attribute default, so edit code reading nested keys would crash. Fills the missing
+ * nested keys from the registered defaults before the edit component reads them.
+ */
+export declare function withObjectDefaults<Props extends {
+    attributes: PlainObject;
+}>(Edit: ComponentType<Props>): (props: Props) => import("react").JSX.Element;
+export {};
+//# sourceMappingURL=withObjectDefaults.d.ts.map

package/build/utils/withObjectDefaults.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"withObjectDefaults.d.ts","sourceRoot":"","sources":["../../src/utils/withObjectDefaults.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAC,aAAa,EAAC,MAAM,OAAO,CAAA;AAExC,KAAK,WAAW,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;AAa1C;;;;GAIG;AACH,wBAAgB,kBAAkB,CAAC,KAAK,SAAS;IAAC,UAAU,EAAE,WAAW,CAAA;CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,KAAK,CAAC,WACtD,KAAK,iCAapD"}

package/build/utils/withObjectDefaults.js

@@ -0,0 +1,37 @@
+import { jsx as _jsx } from "react/jsx-runtime";
+import { getBlockType } from '@wordpress/blocks';
+import { useMemo } from '@wordpress/element';
+const isPlainObject = (value) => typeof value === 'object' && value !== null && !Array.isArray(value);
+// keys present in the value win, missing ones are taken from the fallback (recursively)
+function mergeMissing(fallback, value) {
+    if (value === undefined)
+        return fallback;
+    if (!isPlainObject(fallback) || !isPlainObject(value))
+        return value;
+    const merged = { ...value };
+    for (const [key, fallbackValue] of Object.entries(fallback))
+        merged[key] = mergeMissing(fallbackValue, value[key]);
+    return merged;
+}
+/**
+ * Block markup can carry partial object attributes (e.g. generated content) and WP does not deep-merge
+ * them with the attribute default, so edit code reading nested keys would crash. Fills the missing
+ * nested keys from the registered defaults before the edit component reads them.
+ */
+export function withObjectDefaults(Edit) {
+    return function EditWithObjectDefaults(props) {
+        const { name } = props;
+        const attributes = useMemo(() => {
+            var _a;
+            var _b;
+            const definitions = (_b = (name ? (_a = getBlockType(name)) === null || _a === void 0 ? void 0 : _a.attributes : undefined)) !== null && _b !== void 0 ? _b : {};
+            const filled = { ...props.attributes };
+            for (const [key, definition] of Object.entries(definitions)) {
+                if (definition.type === 'object' && isPlainObject(definition.default))
+                    filled[key] = mergeMissing(definition.default, filled[key]);
+            }
+            return filled;
+        }, [name, props.attributes]);
+        return _jsx(Edit, { ...props, attributes: attributes });
+    };
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brilo/base-blocks",
-  "version": "0.1.55",
+  "version": "0.1.56",
   "author": "Brilo",
   "main": "./build/index.js",
   "types": "./build/index.d.ts",

package/src/blocks/core/basic-icon/factory.tsx

@@ -1,4 +1,5 @@
 import type {BlockConfiguration} from '@wordpress/blocks'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import {__} from '@wordpress/i18n'
 import {DEFAULT_ALIGNMENTS, DEFAULT_ICON_BACKGROUND_SHAPES, DEFAULT_ICON_BACKGROUND_SIZE, DEFAULT_ICON_SIZE, ICON_TYPES} from './constants'
 import {createBasicIconEdit} from './edit'
@@ -36,7 +37,7 @@ export function createBasicIconBlock(options: BasicIconOptions): BlockConfigurat
         },
       },
     },
-    edit: createBasicIconEdit(options),
+    edit: withObjectDefaults(createBasicIconEdit(options)),
     save: () => null,
   } as unknown as BlockConfiguration<BasicIconAttributes>
 }

package/src/blocks/faq/faq-group/factory.tsx

@@ -1,4 +1,5 @@
 import {InnerBlocks} from '@wordpress/block-editor'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import type {BlockConfiguration} from '@wordpress/blocks'
 import {__} from '@wordpress/i18n'
 import {ITEM_SPACING_ATTRIBUTE} from '~/components/ItemSpacingControl'
@@ -55,7 +56,7 @@ export function createFaqGroupBlock<TIconVariants extends OptionArray = typeof D
     icon: options.icon ?? 'editor-help',
     supports: {html: false, customClassName: false},
     attributes,
-    edit: createFaqGroupEdit(options as unknown as FaqGroupOptions),
+    edit: withObjectDefaults(createFaqGroupEdit(options as unknown as FaqGroupOptions)),
     save: () => <InnerBlocks.Content />,
   } as unknown as BlockConfiguration<FaqGroupAttributes<TIconVariants[number]['value']>>
 }

package/src/blocks/groups/banner-group/factory.tsx

@@ -1,4 +1,5 @@
 import {InnerBlocks} from '@wordpress/block-editor'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import type {BlockConfiguration} from '@wordpress/blocks'
 import {__} from '@wordpress/i18n'
 import type {OptionArray, StringArray} from '~/types'
@@ -58,7 +59,7 @@ export function createBannerGroupBlock<
       backgroundColor: {type: 'string', default: ''},
       textColor: {type: 'string', default: ''},
     },
-    edit: createBannerGroupEdit(options as unknown as BannerGroupOptions),
+    edit: withObjectDefaults(createBannerGroupEdit(options as unknown as BannerGroupOptions)),
     save: () => <InnerBlocks.Content />,
   } as unknown as BlockConfiguration<BannerGroupAttributes<TVariants[number]['value'], THeadingStyles[number]>>
 }

package/src/blocks/groups/basic-header-group/factory.tsx

@@ -1,4 +1,5 @@
 import type {BlockConfiguration} from '@wordpress/blocks'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import {__} from '@wordpress/i18n'
 import type {NumberArray, OptionArray, StringArray} from '~/types'
 import {DEFAULT_ALIGNMENTS, DEFAULT_LEVELS, DEFAULT_STYLES} from './constants'
@@ -40,7 +41,7 @@ export function createBasicHeaderGroupBlock<
         enum: alignments.map((a) => a.value),
       },
     },
-    edit: createBasicHeaderGroupEdit(options as unknown as BasicHeaderGroupOptions),
+    edit: withObjectDefaults(createBasicHeaderGroupEdit(options as unknown as BasicHeaderGroupOptions)),
     save: () => null,
   } as unknown as BlockConfiguration<BasicHeaderGroupAttributes<TLevels[number], TStyles[number], TAlignments[number]['value']>>
 }

package/src/blocks/groups/text-and-media-group/factory.tsx

@@ -1,4 +1,5 @@
 import {InnerBlocks} from '@wordpress/block-editor'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import type {BlockConfiguration} from '@wordpress/blocks'
 import {__} from '@wordpress/i18n'
 import type {OptionArray} from '~/types'
@@ -90,7 +91,7 @@ export function createTextAndMediaGroupBlock<
       },
       content: {type: 'object', default: {size: contentSizes[1]?.value ?? contentSizes[0].value}},
     },
-    edit: createTextAndMediaGroupEdit(options as unknown as TextAndMediaGroupOptions),
+    edit: withObjectDefaults(createTextAndMediaGroupEdit(options as unknown as TextAndMediaGroupOptions)),
     save: () => <InnerBlocks.Content />,
   } as unknown as BlockConfiguration<
     TextAndMediaGroupAttributes<

package/src/blocks/map/map-group/factory.tsx

@@ -1,4 +1,5 @@
 import type {BlockConfiguration} from '@wordpress/blocks'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import {__} from '@wordpress/i18n'
 import {createMapGroupEdit} from './edit'
 import type {MapGroupAttributes, MapGroupOptions} from './types'
@@ -67,7 +68,7 @@ export function createMapGroupBlock<THeadingStyles extends StringArray = typeof
         default: '',
       },
     },
-    edit: createMapGroupEdit(options as unknown as MapGroupOptions),
+    edit: withObjectDefaults(createMapGroupEdit(options as unknown as MapGroupOptions)),
     save: () => <InnerBlocks.Content />,
   } as unknown as BlockConfiguration<MapGroupAttributes<THeadingStyles[number]>>
 }

package/src/blocks/newsletter/newsletter-form/factory.tsx

@@ -1,4 +1,5 @@
 import type {BlockConfiguration} from '@wordpress/blocks'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import {__} from '@wordpress/i18n'
 import {DEFAULT_HEADING_STYLES, NEWSLETTER_LEVELS} from './constants'
 import {createNewsletterFormEdit} from './edit'
@@ -53,7 +54,7 @@ export function createNewsletterFormBlock(options: NewsletterFormOptions): Block
         },
       },
     },
-    edit: createNewsletterFormEdit(options),
+    edit: withObjectDefaults(createNewsletterFormEdit(options)),
     save: () => null,
   } as unknown as BlockConfiguration<NewsletterFormAttributes>
 }

package/src/blocks/text-and-form/text-and-form-text-column/factory.tsx

@@ -1,4 +1,5 @@
 import {InnerBlocks} from '@wordpress/block-editor'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import type {BlockConfiguration} from '@wordpress/blocks'
 import {__} from '@wordpress/i18n'
 import type {OptionArray} from '~/types'
@@ -35,7 +36,7 @@ export function createTextAndFormTextColumnBlock<
       },
       content: {type: 'object', default: {size: contentSizes[1]?.value ?? contentSizes[0].value}},
     },
-    edit: createTextAndFormTextColumnEdit(options as unknown as TextAndFormTextColumnOptions),
+    edit: withObjectDefaults(createTextAndFormTextColumnEdit(options as unknown as TextAndFormTextColumnOptions)),
     save: () => <InnerBlocks.Content />,
   } as unknown as BlockConfiguration<TextAndFormTextColumnAttributes<THeadingStyles[number]['value'], TContentSizes[number]['value']>>
 }

package/src/blocks/usp/usp-group/factory.tsx

@@ -1,4 +1,5 @@
 import {InnerBlocks} from '@wordpress/block-editor'
+import {withObjectDefaults} from '~/utils/withObjectDefaults'
 import type {BlockConfiguration} from '@wordpress/blocks'
 import {__} from '@wordpress/i18n'
 import {ITEM_SPACING_ATTRIBUTE} from '~/components/ItemSpacingControl'
@@ -94,7 +95,7 @@ export function createUspGroupBlock<
       },
       ...ITEM_SPACING_ATTRIBUTE,
     },
-    edit: createUspGroupEdit(options as unknown as UspGroupOptions),
+    edit: withObjectDefaults(createUspGroupEdit(options as unknown as UspGroupOptions)),
     save: () => <InnerBlocks.Content />,
   } as unknown as BlockConfiguration<
     UspGroupAttributes<

package/src/utils/withObjectDefaults.tsx

@@ -0,0 +1,37 @@
+import {getBlockType} from '@wordpress/blocks'
+import {useMemo} from '@wordpress/element'
+import type {ComponentType} from 'react'
+
+type PlainObject = Record<string, unknown>
+
+const isPlainObject = (value: unknown): value is PlainObject => typeof value === 'object' && value !== null && !Array.isArray(value)
+
+// keys present in the value win, missing ones are taken from the fallback (recursively)
+function mergeMissing(fallback: unknown, value: unknown): unknown {
+  if (value === undefined) return fallback
+  if (!isPlainObject(fallback) || !isPlainObject(value)) return value
+  const merged: PlainObject = {...value}
+  for (const [key, fallbackValue] of Object.entries(fallback)) merged[key] = mergeMissing(fallbackValue, value[key])
+  return merged
+}
+
+/**
+ * Block markup can carry partial object attributes (e.g. generated content) and WP does not deep-merge
+ * them with the attribute default, so edit code reading nested keys would crash. Fills the missing
+ * nested keys from the registered defaults before the edit component reads them.
+ */
+export function withObjectDefaults<Props extends {attributes: PlainObject}>(Edit: ComponentType<Props>) {
+  return function EditWithObjectDefaults(props: Props) {
+    const {name} = props as Props & {name?: string}
+    const attributes = useMemo(() => {
+      const definitions = (name ? getBlockType(name)?.attributes : undefined) ?? {}
+      const filled: PlainObject = {...props.attributes}
+      for (const [key, definition] of Object.entries(definitions as Record<string, {type?: unknown; default?: unknown}>)) {
+        if (definition.type === 'object' && isPlainObject(definition.default)) filled[key] = mergeMissing(definition.default, filled[key])
+      }
+      return filled as Props['attributes']
+    }, [name, props.attributes])
+
+    return <Edit {...props} attributes={attributes} />
+  }
+}