[CSL-3088] - fix issue with conflicting styles #128
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -17,7 +17,7 @@ | |
| right: 24px; | ||
| } | ||
|
|
||
| .cio-autocomplete.custom-autocomplete-styles .cio-section-name { | ||
| margin: 5px 3px; | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| /* eslint-disable no-param-reassign */ | ||
| import React from 'react'; | ||
| import useCioAutocomplete from '../../../hooks/useCioAutocomplete'; | ||
| import { isCustomSection, isRecommendationsSection } from '../../../typeGuards'; | ||
| import { Item } from '../../../types'; | ||
| import { camelToStartCase, getStoryParams, toKebabCase } from '../../../utils'; | ||
|
|
||
| export function HooksTemplate(args) { | ||
| const { | ||
|
|
@@ -119,32 +119,41 @@ export function HooksTemplate(args) { | |
| if (!section?.data?.length) { | ||
| return null; | ||
| } | ||
|
|
||
| const { type, displayName } = section; | ||
| const sectionListingType = isCustomSection(section) | ||
| ? 'custom' | ||
| : toKebabCase(section.indexSectionName || section.data[0]?.section || 'Products'); | ||
|
|
||
| let sectionTitle: string; | ||
|
Contributor
There was a problem hiding this comment. Same for sectionTitle. Is there a way we can get this from getSectionProps instead? |
||
| switch (type) { | ||
| case 'recommendations': | ||
| sectionTitle = section.podId; | ||
| break; | ||
| case 'custom': | ||
| sectionTitle = displayName; | ||
| break; | ||
| case 'autocomplete': | ||
| sectionTitle = section.indexSectionName; | ||
| break; | ||
| default: | ||
| sectionTitle = section.indexSectionName; | ||
| break; | ||
|
Comment on lines
139
to
141
Contributor
There was a problem hiding this comment. This is (type) broken currently but we still need it. Sections can be one of type There's two ways to fix this:
I'll pull up a separate PR for this.
Contributor
There was a problem hiding this comment. which part you mean "This is (type) broken currently"? @Mudaafi
Contributor
There was a problem hiding this comment. @mocca102 Might be my configuration, but since we've explicitly defined the type |
||
| } | ||
|
|
||
| if (displayName) { | ||
| sectionTitle = displayName; | ||
| } | ||
|
|
||
| let sectionClassNames = toKebabCase(sectionListingType); | ||
| if (isRecommendationsSection(section)) { | ||
| sectionClassNames += ` ${toKebabCase(section.podId)}`; | ||
| } | ||
|
|
||
| return ( | ||
| <div key={sectionTitle} className={sectionClassNames}> | ||
| <div {...getSectionProps(section)}> | ||
| <h5 className='cio-section-name'>{camelToStartCase(sectionTitle)}</h5> | ||
| <div className='cio-section-items'> | ||
| {section?.data?.map((item) => renderItem(item))} | ||
| </div> | ||
|
|
@@ -271,32 +280,38 @@ function YourComponent() { | |
| if (!section?.data?.length) { | ||
| return null; | ||
| } | ||
|
|
||
| const { type, displayName } = section; | ||
| let sectionTitle: string; | ||
|
|
||
| switch (type) { | ||
| case 'recommendations': | ||
| sectionTitle = section.podId; | ||
| break; | ||
| case 'custom': | ||
| sectionTitle = displayName; | ||
| break; | ||
| case 'autocomplete': | ||
| sectionTitle = section.indexSectionName; | ||
| break; | ||
| default: | ||
| sectionTitle = section.indexSectionName; | ||
| break; | ||
| } | ||
|
|
||
| if (displayName) { | ||
| sectionTitle = displayName; | ||
| } | ||
|
|
||
| let sectionClassNames = toKebabCase(sectionTitle); | ||
| if (isRecommendationsSection(section)) { | ||
| sectionClassNames += \` \${toKebabCase(section.indexSectionName)}\`; | ||
| } | ||
|
|
||
| return ( | ||
| <div key={sectionTitle} className={sectionClassNames}> | ||
| <div {...getSectionProps(section)}> | ||
| <h5 className='cio-section-name'>{camelToStartCase(sectionTitle)}</h5> | ||
| <div className='cio-section-items'> | ||
| {section?.data?.map((item) => renderItem(item))} | ||
| </div> | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a way we can get this from getSectionProps since this same logic is being duplicated
https://github.com/Constructor-io/constructorio-ui-autocomplete/pull/128/files#diff-7f1c987b478566cc9cf82a2afc2ee7a7a150ec6047a7801e0ac01c410f7ce453R218
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We could. The reason why its included here is because we've rendered a separate
divwith the relevant classes in Line 154 so we kind of have to duplicate the logic to get the required values here.Took a look at our history and it might be something we've included prior to creating
getSectionPropsso we might be good to omit this entirely from the story. @esezen would love to get your thoughts here since you touched it previously.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
In terms of passing this variable via
getSectionPropsitself, I thoughtgetSectionPropsis meant to contain only the attributes we're going to render into the HTML? I would be against adding something in specifically for our Storybook.