From fc80421e61b88b45c4a6b6e3a8b16d6136e538c6 Mon Sep 17 00:00:00 2001 From: mateuswetah Date: Fri, 10 Jul 2020 15:10:11 -0300 Subject: [PATCH] Block control adjustments to facets blocks. #399 --- ...tainacan-gutenberg-block-common-styles.css | 27 ------ ...acan-gutenberg-block-common-styles.css.map | 2 +- .../gutenberg-blocks-style.scss | 33 ------- .../tainacan-facets/faceted-search/index.js | 87 ++++++------------- .../tainacan-facets/facets-list/index.js | 41 ++++----- .../tainacan-items/search-bar/index.js | 54 +++++------- 6 files changed, 69 insertions(+), 175 deletions(-) diff --git a/src/assets/css/tainacan-gutenberg-block-common-styles.css b/src/assets/css/tainacan-gutenberg-block-common-styles.css index 3bef4a91b..792e8c31b 100644 --- a/src/assets/css/tainacan-gutenberg-block-common-styles.css +++ b/src/assets/css/tainacan-gutenberg-block-common-styles.css @@ -7,33 +7,6 @@ --tainacan-block-gray5: #454647; --tainacan-block-primary: #298596; } -[data-align='full'] .tainacan-block-control { - width: calc(100% + 14px); } - -.tainacan-block-control { - display: flex; - flex-wrap: wrap; - flex-direction: row; - justify-content: center; - align-items: center; - padding: 5px; - position: relative; - top: -14px; - left: -14px; - width: calc(100% + 28px); - background: var(--tainacan-block-gray1, #f2f2f2); } - .tainacan-block-control p { - font-size: 0.875em !important; - margin: 12px 1.5em !important; - fill: var(--tainacan-block-gray4, #555758); } - .tainacan-block-control p svg { - top: 6px; - margin-right: 0.75em; - position: relative; - fill: var(--tainacan-block-gray4, #555758); } - .tainacan-block-control .components-base-control .components-base-control__field { - margin-bottom: 0; } - .tainacan-block-placeholder.components-placeholder { align-items: center !important; margin-bottom: 0 !important; diff --git a/src/assets/css/tainacan-gutenberg-block-common-styles.css.map b/src/assets/css/tainacan-gutenberg-block-common-styles.css.map index 67e522ad4..c0a4331a3 100644 --- a/src/assets/css/tainacan-gutenberg-block-common-styles.css.map +++ b/src/assets/css/tainacan-gutenberg-block-common-styles.css.map @@ -1,6 +1,6 @@ { "version": 3, -"mappings": "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", +"mappings": "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", "sources": ["../../views/gutenberg-blocks/gutenberg-blocks-style.scss","../../views/gutenberg-blocks/gutenberg-blocks-variables.scss"], "names": [], "file": "tainacan-gutenberg-block-common-styles.css" diff --git a/src/views/gutenberg-blocks/gutenberg-blocks-style.scss b/src/views/gutenberg-blocks/gutenberg-blocks-style.scss index caa3477fe..43d915b15 100644 --- a/src/views/gutenberg-blocks/gutenberg-blocks-style.scss +++ b/src/views/gutenberg-blocks/gutenberg-blocks-style.scss @@ -13,39 +13,6 @@ } // Control and placeholder region ---------------------------------------------------- -[data-align='full'] .tainacan-block-control { - width: calc(100% + 14px); -} -.tainacan-block-control { - display: flex; - flex-wrap: wrap; - flex-direction: row; - justify-content: center; - align-items: center; - padding: 5px; - position: relative; - top: -14px; - left: -14px; - width: calc(100% + 28px); - background: var(--tainacan-block-gray1, $gray1); - - p { - font-size: 0.875em !important; - margin: 12px 1.5em !important; - fill: var(--tainacan-block-gray4, $gray4); - - svg { - top: 6px; - margin-right: 0.75em; - position: relative; - fill: var(--tainacan-block-gray4, $gray4); - } - } - - .components-base-control .components-base-control__field { - margin-bottom: 0; - } -} .tainacan-block-placeholder.components-placeholder { align-items: center !important; margin-bottom: 0 !important; diff --git a/src/views/gutenberg-blocks/tainacan-facets/faceted-search/index.js b/src/views/gutenberg-blocks/tainacan-facets/faceted-search/index.js index 5456f79c9..da98506b7 100644 --- a/src/views/gutenberg-blocks/tainacan-facets/faceted-search/index.js +++ b/src/views/gutenberg-blocks/tainacan-facets/faceted-search/index.js @@ -756,66 +756,6 @@ registerBlockType('tainacan/faceted-search', { - { isSelected ? - ( -
-
-

- - - - - - {__('Show items list from: ', 'tainacan')} -   - { - listType = aListType; - - if (listType != 'collection') { - enabledViewModes = registeredViewModesKeys; - defaultViewMode = 'masonry'; - } - - setAttributes({ - listType: aListType, - enabledViewModes: enabledViewModes, - defaultViewMode: defaultViewMode - }); - } } - /> -   - { - (listType == 'collection' && collectionId != undefined) || (listType == 'term' && termId != undefined) ? - - : null - } -

-
-
- ) : null - } - { ( termId == undefined && listType == 'term' ) || ( collectionId == undefined && listType == 'collection' ) ? ( - {__('Show a complete items list with faceted search.', 'tainacan')} + {__('Show a complete items list with faceted search from: ', 'tainacan')}

+ { + listType = aListType; + + if (listType != 'collection') { + enabledViewModes = registeredViewModesKeys; + defaultViewMode = 'masonry'; + } + + setAttributes({ + listType: aListType, + enabledViewModes: enabledViewModes, + defaultViewMode: defaultViewMode + }); + } } + /> +   - - ): null - } ) : null } diff --git a/src/views/gutenberg-blocks/tainacan-items/search-bar/index.js b/src/views/gutenberg-blocks/tainacan-items/search-bar/index.js index 00e03c5ff..902b3d73d 100644 --- a/src/views/gutenberg-blocks/tainacan-items/search-bar/index.js +++ b/src/views/gutenberg-blocks/tainacan-items/search-bar/index.js @@ -2,7 +2,7 @@ const { registerBlockType } = wp.blocks; const { __ } = wp.i18n; -const { RangeControl, TextControl, Toolbar, SelectControl, Button, ToggleControl, Placeholder, ColorPicker, ColorPalette, BaseControl, PanelBody } = wp.components; +const { RangeControl, TextControl, Toolbar, ToolbarButton, SelectControl, Button, ToggleControl, Placeholder, ColorPicker, ColorPalette, BaseControl, PanelBody } = wp.components; const { InspectorControls, BlockControls } = wp.editor; @@ -31,7 +31,8 @@ registerBlockType('tainacan/search-bar', { description: __('Set up a custom search bar to redirect to an item\'s list', 'tainacan'), example: { attributes: { - content: 'preview' + collectionId: 'default', + collectionSlug: 'preview' } }, attributes: { @@ -316,6 +317,27 @@ registerBlockType('tainacan/search-bar', {
+ { collectionId ? ( + openSearchBarModal() }> +

+ + + + + + + +

  + {__('Configure search source', 'tainacan')} + + ): null + }
@@ -471,34 +493,6 @@ registerBlockType('tainacan/search-bar', { onCancelSelection={ () => setAttributes({ isModalOpen: false }) }/> : null } - - { collectionId ? ( -
-

- - - - - - - - {__('Set up a custom search bar to redirect to an item\'s list', 'tainacan')} -

- -
- ): null - } ) : null }