Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

hide search block fields #213

Merged
merged 7 commits into from
Aug 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions news/213.bugfix
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hide unnecessary Search block fields. @danalvrz
60 changes: 31 additions & 29 deletions src/components/Blocks/Search/TopSideFacets.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -81,35 +81,37 @@ const TopSideFacets = (props) => {
total={totalItems}
as="h5"
/>
<div className="sort-on-wrapper">
<span className="sort-label">
{intl.formatMessage(messages.sort)}
</span>
<SortOn
data={data}
querystring={querystring}
isEditMode={isEditMode}
sortOn={sortOn}
sortOrder={sortOrder}
setSortOn={(sortOn) => {
flushSync(() => {
setSortOn(sortOn);
onTriggerSearch(searchedText || '', facets, sortOn);
});
}}
setSortOrder={(sortOrder) => {
flushSync(() => {
setSortOrder(sortOrder);
onTriggerSearch(
searchedText || '',
facets,
sortOn,
sortOrder,
);
});
}}
/>
</div>
{data.sortOnOptions && data.sortOnOptions.length > 0 && (
<div className="sort-on-wrapper">
<span className="sort-label">
{intl.formatMessage(messages.sort)}
</span>
<SortOn
data={data}
querystring={querystring}
isEditMode={isEditMode}
sortOn={sortOn}
sortOrder={sortOrder}
setSortOn={(sortOn) => {
flushSync(() => {
setSortOn(sortOn);
onTriggerSearch(searchedText || '', facets, sortOn);
});
}}
setSortOrder={(sortOrder) => {
flushSync(() => {
setSortOrder(sortOrder);
onTriggerSearch(
searchedText || '',
facets,
sortOn,
sortOrder,
);
});
}}
/>
</div>
)}
</div>
</div>
)}
Expand Down
6 changes: 6 additions & 0 deletions src/components/Blocks/Search/schema.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const searchBlockSchemaEnhancer = ({ schema, formData, intl }) => {
schema.properties.showSortOn.default = true;
schema.fieldsets = schema.fieldsets.filter((item) => item.id !== 'views');

return schema;
};
22 changes: 14 additions & 8 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@ import { ImageBlockDataAdapter } from './components/Blocks/Image/adapter';

import { AccordionSchemaEnhancer } from './components/Blocks/Accordion/schema';

import { searchBlockSchemaEnhancer } from './components/Blocks/Search/schema';

import gridSVG from './icons/block_icn_grid.svg';
import accordionSVG from './icons/block_icn_accordion.svg';
import EventView from './components/Theme/EventView';
Expand Down Expand Up @@ -264,14 +266,18 @@ const applyConfig = (config) => {
schemaEnhancer: defaultStylingSchema,
};

config.blocks.blocksConfig.search.variations = [
{
id: 'facetsTopSide',
title: 'Facets on top',
view: TopSideFacets,
isDefault: true,
},
];
config.blocks.blocksConfig.search = {
...config.blocks.blocksConfig.search,
schemaEnhancer: searchBlockSchemaEnhancer,
variations: [
{
id: 'facetsTopSide',
title: 'Facets on top',
view: TopSideFacets,
isDefault: true,
},
],
};

config.blocks.blocksConfig.__button = {
...config.blocks.blocksConfig.__button,
Expand Down
2 changes: 2 additions & 0 deletions src/theme/_layout.scss
Original file line number Diff line number Diff line change
Expand Up @@ -266,6 +266,8 @@ footer {
.block.heading .heading-wrapper,
.block-editor-listing .items,
.block-editor-listing .listing.message,
.block-editor-search .listing-item,
.block-editor-search .search-input-resultscount-sort,
.block-editor-separator.has--align--full .block.separator,
.block-editor-separator .block.separator.has--align--full,
.block.teaser.has--align--center,
Expand Down
19 changes: 19 additions & 0 deletions src/theme/blocks/_search.scss
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,11 @@
.card-container > img {
width: 100% !important;
}

.listing-item:last-child {
padding-bottom: 0;
border-bottom: none;
}
}
.items {
padding: 0 !important;
Expand All @@ -23,6 +28,10 @@
color: $black;
@include text-heading-h2();
}
&:last-child {
padding-bottom: 40px;
border-bottom: 1px solid $black;
}

&:not(.grid) {
img {
Expand Down Expand Up @@ -240,3 +249,13 @@
}
}
}

// Hidden fields
.inline.field {
&.field-wrapper-showSearchInput,
&.field-wrapper-showSearchButton,
&.field-wrapper-showTotalResults,
&.field-wrapper-showSortOn {
display: none;
}
}