Skip to content

Commit

Permalink
Cleaner CSS class names + more semantic HTML markup
Browse files Browse the repository at this point in the history
  • Loading branch information
cee-chen committed Dec 7, 2020
1 parent 6a6ff41 commit dda58c4
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.appSearchResult {
display: flex;

&__contentWrap {
&__content {
width: 100%;
padding: $euiSize;
overflow: hidden;
Expand All @@ -13,7 +13,7 @@
margin-top: $euiSizeS;
}

&__toggleExpandButton {
&__actionButton {
display: flex;
justify-content: center;
align-items: center;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,29 +41,30 @@ export const Result: React.FC<Props> = ({ result, showScore }) => {
defaultMessage: 'View document details',
})}
>
<div className="appSearchResult__contentWrap">
<article className="appSearchResult__content">
<ResultHeader resultMeta={resultMeta} showScore={!!showScore} />
<div className="appSearchResult__contentInner">
<div className="appSearchResult__body">
{resultFields
.slice(0, isOpen ? resultFields.length : RESULT_CUTOFF)
.map(([field, value]: [string, FieldValue]) => (
<ResultField key={field} field={field} raw={value.raw} snippet={value.snippet} />
))}
</div>
{numResults > RESULT_CUTOFF && !isOpen && (
<div className="appSearchResult__hiddenFieldsIndicator">
<footer className="appSearchResult__hiddenFieldsIndicator">
{i18n.translate('xpack.enterpriseSearch.appSearch.result.numberOfAdditionalFields', {
defaultMessage: '{numberOfAdditionalFields} more fields',
values: {
numberOfAdditionalFields: numResults - RESULT_CUTOFF,
},
})}
</div>
</footer>
)}
</div>
</article>
{numResults > RESULT_CUTOFF && (
<button
className="appSearchResult__toggleExpandButton"
type="button"
className="appSearchResult__actionButton"
onClick={() => setIsOpen(!isOpen)}
aria-label={
isOpen
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export const ResultHeader: React.FC<Props> = ({ showScore, resultMeta }) => {
const showEngineLabel: boolean = resultMeta.id !== resultMeta.scopedId;

return (
<div className="appSearchResultHeader">
<header className="appSearchResultHeader">
{showScore && (
<div className="appSearchResultHeader__column">
<ResultHeaderItem
Expand All @@ -43,6 +43,6 @@ export const ResultHeader: React.FC<Props> = ({ showScore, resultMeta }) => {
)}
<ResultHeaderItem data-test-subj="ResultId" field="id" value={resultMeta.id} type="id" />
</div>
</div>
</header>
);
};

0 comments on commit dda58c4

Please sign in to comment.