Skip to content

Commit 4a0887c

Browse files
razwanrazwan
committed
quickfix
1 parent 7f2405e commit 4a0887c

File tree

7 files changed

+31
-242
lines changed

7 files changed

+31
-242
lines changed

‎dist/js/editor.blocks.js

+22-157
Original file line numberDiff line numberDiff line change
@@ -9999,25 +9999,23 @@ Object.defineProperty(__webpack_exports__, "__esModule", { value: true });
99999999
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scss_editor_scss__ = __webpack_require__(111);
1000010000
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3__scss_editor_scss___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3__scss_editor_scss__);
1000110001
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4__filters_with_block_id__ = __webpack_require__(112);
10002-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__filters_with_block_index__ = __webpack_require__(264);
10003-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__filters_with_font_size_picker__ = __webpack_require__(139);
10004-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__blocks_core_separator__ = __webpack_require__(97);
10005-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__blocks_announcement_bar__ = __webpack_require__(152);
10006-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__blocks_google_map__ = __webpack_require__(153);
10007-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__blocks_header__ = __webpack_require__(187);
10008-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__blocks_headline__ = __webpack_require__(190);
10009-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__blocks_hero__ = __webpack_require__(194);
10010-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__blocks_logo__ = __webpack_require__(212);
10011-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__blocks_media__ = __webpack_require__(213);
10012-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__blocks_slideshow__ = __webpack_require__(218);
10013-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__blocks_navigation__ = __webpack_require__(225);
10014-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__blocks_menu_food__ = __webpack_require__(227);
10015-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__blocks_menu_food_section__ = __webpack_require__(232);
10016-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__blocks_menu_food_item__ = __webpack_require__(236);
10017-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__blocks_opentable__ = __webpack_require__(241);
10018-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__store__ = __webpack_require__(106);
10019-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_22__icons__ = __webpack_require__(2);
10020-
10002+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5__filters_with_font_size_picker__ = __webpack_require__(139);
10003+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_6__blocks_core_separator__ = __webpack_require__(97);
10004+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_7__blocks_announcement_bar__ = __webpack_require__(152);
10005+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_8__blocks_google_map__ = __webpack_require__(153);
10006+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_9__blocks_header__ = __webpack_require__(187);
10007+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_10__blocks_headline__ = __webpack_require__(190);
10008+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_11__blocks_hero__ = __webpack_require__(194);
10009+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_12__blocks_logo__ = __webpack_require__(212);
10010+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_13__blocks_media__ = __webpack_require__(213);
10011+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_14__blocks_slideshow__ = __webpack_require__(218);
10012+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_15__blocks_navigation__ = __webpack_require__(225);
10013+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_16__blocks_menu_food__ = __webpack_require__(227);
10014+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_17__blocks_menu_food_section__ = __webpack_require__(232);
10015+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_18__blocks_menu_food_item__ = __webpack_require__(236);
10016+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_19__blocks_opentable__ = __webpack_require__(241);
10017+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_20__store__ = __webpack_require__(106);
10018+
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_21__icons__ = __webpack_require__(2);
1002110019

1002210020

1002310021

@@ -10059,19 +10057,17 @@ var novaBlocks = function () {
1005910057
__WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_createClass___default()(novaBlocks, [{
1006010058
key: 'initialize',
1006110059
value: function initialize(settings) {
10062-
Object(__WEBPACK_IMPORTED_MODULE_7__blocks_core_separator__["a" /* addSeparatorFilters */])(settings);
10063-
dispatch(__WEBPACK_IMPORTED_MODULE_21__store__["a" /* STORE_NAME */]).updateSettings(settings);
10060+
Object(__WEBPACK_IMPORTED_MODULE_6__blocks_core_separator__["a" /* addSeparatorFilters */])(settings);
10061+
dispatch(__WEBPACK_IMPORTED_MODULE_20__store__["a" /* STORE_NAME */]).updateSettings(settings);
1006410062
updateCategory('nova-blocks', {
10065-
icon: __WEBPACK_IMPORTED_MODULE_22__icons__["o" /* nova */]
10063+
icon: __WEBPACK_IMPORTED_MODULE_21__icons__["o" /* nova */]
1006610064
});
1006710065
}
1006810066
}]);
1006910067

1007010068
return novaBlocks;
1007110069
}();
1007210070

10073-
(function () {})();
10074-
1007510071
wp.novaBlocks = new novaBlocks();
1007610072

1007710073
/***/ }),
@@ -14913,9 +14909,8 @@ var __ = wp.i18n.__;
1491314909
var InspectorControls = wp.blockEditor.InspectorControls;
1491414910
var _wp$components = wp.components,
1491514911
FocalPointPicker = _wp$components.FocalPointPicker,
14916-
PanelBody = _wp$components.PanelBody,
1491714912
RadioControl = _wp$components.RadioControl,
14918-
ToggleControl = _wp$components.ToggleControl;
14913+
PanelBody = _wp$components.PanelBody;
1491914914
var _wp$element = wp.element,
1492014915
Component = _wp$element.Component,
1492114916
Fragment = _wp$element.Fragment;
@@ -15920,7 +15915,6 @@ var ScrollIndicatorPanel = Object(__WEBPACK_IMPORTED_MODULE_5__with_settings__["
1592015915
* WordPress dependencies
1592115916
*/
1592215917
var InnerBlocks = wp.blockEditor.InnerBlocks;
15923-
var select = wp.data.select;
1592415918

1592515919

1592615920
var HeroPreview = function HeroPreview(props) {
@@ -15938,7 +15932,6 @@ var HeroPreview = function HeroPreview(props) {
1593815932
contentColor = _props$attributes.contentColor,
1593915933
overlayFilterStyle = _props$attributes.overlayFilterStyle,
1594015934
className = props.className,
15941-
clientId = props.clientId,
1594215935
settings = props.settings;
1594315936

1594415937

@@ -15954,16 +15947,6 @@ var HeroPreview = function HeroPreview(props) {
1595415947

1595515948
var minimumHeight = settings.usePostMetaAttributes ? minHeight : minHeightFallback;
1595615949

15957-
var heroBlocks = select('core/block-editor').getBlocks().filter(function (block) {
15958-
return block.name === 'novablocks/hero';
15959-
});
15960-
15961-
var index = heroBlocks.findIndex(function (block) {
15962-
return block.clientId === clientId;
15963-
});
15964-
var scrollIndicatorFallback = index === 0 && minimumHeight === 100;
15965-
var scrollIndicator = settings.usePostMetaAttributes ? scrollIndicatorBlock : scrollIndicatorFallback;
15966-
1596715950
if (!!applyMinimumHeightBlock) {
1596815951
styles.hero.minHeight = minimumHeight + 'vh';
1596915952
}
@@ -15992,7 +15975,7 @@ var HeroPreview = function HeroPreview(props) {
1599215975
{ className: 'novablocks-hero__inner-container novablocks-u-content-width', style: styles.content },
1599315976
wp.element.createElement(InnerBlocks, { template: settings.hero.template })
1599415977
),
15995-
scrollIndicator && wp.element.createElement('div', { className: 'novablocks-hero__indicator' })
15978+
scrollIndicatorBlock && wp.element.createElement('div', { className: 'novablocks-hero__indicator' })
1599615979
)
1599715980
)
1599815981
);
@@ -18265,123 +18248,5 @@ var OpenTableSave = function OpenTableSave(props) {
1826518248

1826618249
/* harmony default export */ __webpack_exports__["a"] = (OpenTableSave);
1826718250

18268-
/***/ }),
18269-
/* 246 */,
18270-
/* 247 */,
18271-
/* 248 */,
18272-
/* 249 */,
18273-
/* 250 */,
18274-
/* 251 */,
18275-
/* 252 */,
18276-
/* 253 */,
18277-
/* 254 */,
18278-
/* 255 */,
18279-
/* 256 */,
18280-
/* 257 */,
18281-
/* 258 */,
18282-
/* 259 */,
18283-
/* 260 */,
18284-
/* 261 */,
18285-
/* 262 */,
18286-
/* 263 */,
18287-
/* 264 */
18288-
/***/ (function(module, __webpack_exports__, __webpack_require__) {
18289-
18290-
"use strict";
18291-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_core_js_object_get_prototype_of__ = __webpack_require__(7);
18292-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_0_babel_runtime_core_js_object_get_prototype_of___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_0_babel_runtime_core_js_object_get_prototype_of__);
18293-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_classCallCheck__ = __webpack_require__(4);
18294-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_classCallCheck___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_classCallCheck__);
18295-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_babel_runtime_helpers_createClass__ = __webpack_require__(5);
18296-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_2_babel_runtime_helpers_createClass___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_2_babel_runtime_helpers_createClass__);
18297-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_babel_runtime_helpers_possibleConstructorReturn__ = __webpack_require__(8);
18298-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_3_babel_runtime_helpers_possibleConstructorReturn___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_3_babel_runtime_helpers_possibleConstructorReturn__);
18299-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits__ = __webpack_require__(9);
18300-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits__);
18301-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_babel_runtime_core_js_object_assign__ = __webpack_require__(74);
18302-
/* harmony import */ var __WEBPACK_IMPORTED_MODULE_5_babel_runtime_core_js_object_assign___default = __webpack_require__.n(__WEBPACK_IMPORTED_MODULE_5_babel_runtime_core_js_object_assign__);
18303-
18304-
18305-
18306-
18307-
18308-
18309-
var createHigherOrderComponent = wp.compose.createHigherOrderComponent;
18310-
var addFilter = wp.hooks.addFilter;
18311-
var Component = wp.element.Component;
18312-
var select = wp.data.select;
18313-
18314-
18315-
var enableBlockIndexAttributeOnBlocks = ['novablocks/hero'];
18316-
18317-
function addBlockIndexAttribute(block) {
18318-
18319-
if (!enableBlockIndexAttributeOnBlocks.includes(block.name)) {
18320-
return block;
18321-
}
18322-
18323-
if (typeof block.attributes !== 'undefined') {
18324-
block.attributes = __WEBPACK_IMPORTED_MODULE_5_babel_runtime_core_js_object_assign___default()(block.attributes, {
18325-
blockIndex: {
18326-
type: 'number',
18327-
default: -1
18328-
}
18329-
});
18330-
}
18331-
18332-
return block;
18333-
}
18334-
addFilter('blocks.registerBlockType', 'novablocks/add-blockIndex-attribute', addBlockIndexAttribute);
18335-
18336-
var withBlockIndexAttribute = createHigherOrderComponent(function (BlockEdit) {
18337-
18338-
return function (_Component) {
18339-
__WEBPACK_IMPORTED_MODULE_4_babel_runtime_helpers_inherits___default()(BetterBlockEdit, _Component);
18340-
18341-
function BetterBlockEdit() {
18342-
__WEBPACK_IMPORTED_MODULE_1_babel_runtime_helpers_classCallCheck___default()(this, BetterBlockEdit);
18343-
18344-
return __WEBPACK_IMPORTED_MODULE_3_babel_runtime_helpers_possibleConstructorReturn___default()(this, (BetterBlockEdit.__proto__ || __WEBPACK_IMPORTED_MODULE_0_babel_runtime_core_js_object_get_prototype_of___default()(BetterBlockEdit)).apply(this, arguments));
18345-
}
18346-
18347-
__WEBPACK_IMPORTED_MODULE_2_babel_runtime_helpers_createClass___default()(BetterBlockEdit, [{
18348-
key: 'componentDidMount',
18349-
value: function componentDidMount() {
18350-
this.updateIndex();
18351-
}
18352-
}, {
18353-
key: 'componentDidUpdate',
18354-
value: function componentDidUpdate() {
18355-
this.updateIndex();
18356-
}
18357-
}, {
18358-
key: 'updateIndex',
18359-
value: function updateIndex() {
18360-
var _this2 = this;
18361-
18362-
if (enableBlockIndexAttributeOnBlocks.includes(this.props.name)) {
18363-
var oldIndex = this.props.attributes.blockIndex;
18364-
var newIndex = select('core/block-editor').getBlocks().findIndex(function (block) {
18365-
return block.clientId === _this2.props.clientId;
18366-
});
18367-
18368-
if (oldIndex !== newIndex) {
18369-
this.props.setAttributes({ blockIndex: newIndex });
18370-
}
18371-
}
18372-
}
18373-
}, {
18374-
key: 'render',
18375-
value: function render() {
18376-
return wp.element.createElement(BlockEdit, this.props);
18377-
}
18378-
}]);
18379-
18380-
return BetterBlockEdit;
18381-
}(Component);
18382-
}, "withBlockIndexAttribute");
18383-
18384-
addFilter('editor.BlockEdit', 'novablocks/with-blockIndex-attribute', withBlockIndexAttribute);
18385-
1838618251
/***/ })
1838718252
/******/ ]);

‎lib/extras.php

+4
Original file line numberDiff line numberDiff line change
@@ -359,6 +359,10 @@ function novablocks_add_hero_settings( $settings ) {
359359
),
360360
'attributes' => array_merge(
361361
array(
362+
'blockIndex' => array(
363+
'type' => 'number',
364+
'default' => -1
365+
),
362366
'applyMinimumHeightBlock' => array(
363367
'type' => 'boolean',
364368
'default' => false

‎src/blocks/hero/edit.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,8 @@ const {
2525

2626
const {
2727
FocalPointPicker,
28-
PanelBody,
2928
RadioControl,
30-
ToggleControl,
29+
PanelBody,
3130
} = wp.components;
3231

3332
const {

‎src/blocks/hero/init.php

+3-3
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ function novablocks_render_hero_block( $attributes, $content ) {
8383

8484
<div class="<?php echo esc_attr( join( ' ', $classes ) ); ?>" style="<?php echo esc_attr( 'color: ' . $attributes['contentColor'] ); ?>">
8585

86-
<?php do_action( 'novablocks_hero:after_opening_tag', $attributes ); ?>
86+
<?php do_action( 'novablocks_hero:after_opening_tag' ); ?>
8787

8888
<div class="novablocks-hero__mask">
8989
<div class="novablocks-hero__parallax" data-rellax-amount="<?php echo novablocks_get_parallax_amount( $attributes ); ?>">
@@ -105,15 +105,15 @@ function novablocks_render_hero_block( $attributes, $content ) {
105105
<div class="novablocks-hero__inner-container novablocks-u-content-width" style="<?php echo esc_attr( $contentStyle ); ?>">
106106
<?php echo $content ?>
107107
</div>
108-
<?php if ( $scrollIndicator ) { ?>
108+
<?php if ( ! empty( $attributes['scrollIndicatorBlock'] ) ) { ?>
109109
<div class="novablocks-hero__indicator">
110110
<?php echo $novablocks_settings['hero']['scrollIndicatorMarkup']; ?>
111111
</div>
112112
<?php } ?>
113113
</div>
114114
</div>
115115

116-
<?php do_action( 'novablocks_hero:before_closing_tag', $attributes ) ?>
116+
<?php do_action( 'novablocks_hero:before_closing_tag', array( 'blockIndex' => $attributes['blockIndex'] ) ) ?>
117117

118118
</div>
119119

‎src/blocks/hero/preview.js

+1-14
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@ import HeroBackground from './background';
88
*/
99
const { InnerBlocks } = wp.blockEditor;
1010

11-
const {
12-
select,
13-
} = wp.data;
14-
1511
const HeroPreview = function( props ) {
1612
const {
1713
attributes: {
@@ -34,7 +30,6 @@ const HeroPreview = function( props ) {
3430
overlayFilterStyle,
3531
},
3632
className,
37-
clientId,
3833
settings,
3934
} = props;
4035

@@ -59,14 +54,6 @@ const HeroPreview = function( props ) {
5954

6055
const minimumHeight = settings.usePostMetaAttributes ? minHeight : minHeightFallback;
6156

62-
const heroBlocks = select( 'core/block-editor' ).getBlocks().filter( ( block ) => {
63-
return block.name === 'novablocks/hero';
64-
} );
65-
66-
const index = heroBlocks.findIndex( ( block ) => block.clientId === clientId );
67-
const scrollIndicatorFallback = index === 0 && minimumHeight === 100;
68-
const scrollIndicator = settings.usePostMetaAttributes ? scrollIndicatorBlock : scrollIndicatorFallback;
69-
7057
if ( !! applyMinimumHeightBlock ) {
7158
styles.hero.minHeight = minimumHeight + 'vh';
7259
}
@@ -88,7 +75,7 @@ const HeroPreview = function( props ) {
8875
<div className="novablocks-hero__inner-container novablocks-u-content-width" style={ styles.content }>
8976
<InnerBlocks template={ settings.hero.template } />
9077
</div>
91-
{ scrollIndicator && <div className="novablocks-hero__indicator"></div> }
78+
{ scrollIndicatorBlock && <div className="novablocks-hero__indicator"></div> }
9279
</div>
9380
</div>
9481
</div>

‎src/editor.js

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ import './scss/style.scss';
22
import './scss/editor.scss';
33

44
import "./filters/with-block-id";
5-
import "./filters/with-block-index";
65
import "./filters/with-font-size-picker";
76

87
import "./blocks/core/separator";

0 commit comments

Comments
 (0)