-
Notifications
You must be signed in to change notification settings - Fork 6
refactor: Accordion samples update for react v19 #834
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
Open
MarielaTihova
wants to merge
1
commit into
vnext
Choose a base branch
from
mtihova/accordion-samples-update
base: vnext
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
374 changes: 212 additions & 162 deletions
374
samples/layouts/accordion/customization/src/index.tsx
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,177 +1,227 @@ | ||
import React from 'react'; | ||
import ReactDOM from 'react-dom/client'; | ||
import './index.css'; | ||
import './AccordionCustomization.css'; | ||
import React from "react"; | ||
import ReactDOM from "react-dom/client"; | ||
import "./index.css"; | ||
import "./AccordionCustomization.css"; | ||
import { | ||
IgrAccordion, IgrAccordionModule, IgrCheckbox, IgrCheckboxChangeEventArgs, IgrCheckboxModule, | ||
IgrDateTimeInput, IgrDateTimeInputModule, IgrExpansionPanel, IgrExpansionPanelModule, IgrIcon, | ||
IgrIconModule, IgrRadio, IgrRadioModule, IgrRadioGroup, IgrRadioGroupModule, IgrRating, | ||
IgrRatingModule, IgrRangeSlider, IgrRangeSliderModule, IgrRadioChangeEventArgs, | ||
IgrRangeSliderValueEventArgs, IgrComponentDateValueChangedEventArgs, registerIconFromText | ||
} from 'igniteui-react'; | ||
import 'igniteui-webcomponents/themes/light/bootstrap.css'; | ||
|
||
IgrAccordionModule.register(); | ||
IgrCheckboxModule.register(); | ||
IgrDateTimeInputModule.register(); | ||
IgrExpansionPanelModule.register(); | ||
IgrIconModule.register(); | ||
IgrRadioModule.register(); | ||
IgrRadioGroupModule.register(); | ||
IgrRangeSliderModule.register(); | ||
IgrRatingModule.register(); | ||
IgrAccordion, | ||
IgrCheckbox, | ||
IgrCheckboxChangeEventArgs, | ||
IgrDateTimeInput, | ||
IgrExpansionPanel, | ||
IgrIcon, | ||
IgrRadio, | ||
IgrRadioGroup, | ||
IgrRating, | ||
IgrRangeSlider, | ||
IgrRadioChangeEventArgs, | ||
IgrRangeSliderValueEventArgs, | ||
IgrComponentDateValueChangedEventArgs, | ||
registerIconFromText, | ||
} from "igniteui-react"; | ||
import "igniteui-webcomponents/themes/light/bootstrap.css"; | ||
|
||
type Category = { checked: boolean; type: string }; | ||
|
||
const clearIcon = | ||
"<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' width='24' height='24' viewBox='0 0 24 24'><path d='M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z' /></svg>"; | ||
"<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' width='24' height='24' viewBox='0 0 24 24'><path d='M19,6.41L17.59,5L12,10.59L6.41,5L5,6.41L10.59,12L5,17.59L6.41,19L12,13.41L17.59,19L19,17.59L13.41,12L19,6.41Z' /></svg>"; | ||
const clockIcon = | ||
"<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' width='24' height='24' viewBox='0 0 24 24'><path d='M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z' /></svg>"; | ||
"<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' version='1.1' width='24' height='24' viewBox='0 0 24 24'><path d='M12,20A8,8 0 0,0 20,12A8,8 0 0,0 12,4A8,8 0 0,0 4,12A8,8 0 0,0 12,20M12,2A10,10 0 0,1 22,12A10,10 0 0,1 12,22C6.47,22 2,17.5 2,12A10,10 0 0,1 12,2M12.5,7V12.25L17,14.92L16.25,16.15L11,13V7H12.5Z' /></svg>"; | ||
|
||
export default class AccordionCustomization extends React.Component<any, any> { | ||
private categories = [ | ||
{ checked: false, type: "Bike" }, | ||
{ checked: false, type: "Motorcycle" }, | ||
{ checked: false, type: "Car" }, | ||
{ checked: false, type: "Taxi" }, | ||
{ checked: false, type: "Public Transport" } | ||
]; | ||
|
||
private dateTimeInput: IgrDateTimeInput; | ||
|
||
constructor(props: any) { | ||
super(props); | ||
this.state = { | ||
categories: this.categories, | ||
cost: { lower: 200, upper: 800 }, | ||
rating: '', | ||
time: 'Time' | ||
}; | ||
|
||
this.categoriesChange = this.categoriesChange.bind(this); | ||
this.costRangeChange = this.costRangeChange.bind(this); | ||
this.ratingChange = this.ratingChange.bind(this); | ||
this.timeChange = this.timeChange.bind(this); | ||
this.clearTime = this.clearTime.bind(this); | ||
this.dateTimeInputRef = this.dateTimeInputRef.bind(this); | ||
|
||
registerIconFromText("clear", clearIcon, "material"); | ||
registerIconFromText("clock", clockIcon, "material"); | ||
} | ||
|
||
public render(): JSX.Element { | ||
return ( | ||
<div id="root"> | ||
<div className="sample-wrapper"> | ||
<IgrAccordion> | ||
<IgrExpansionPanel key="ep1"> | ||
<h1 slot="title" key="ep1Title"> | ||
Categories | ||
{this.state.categories.some((c: Category) => c.checked) && ': '} | ||
{this.state.categories.filter((c: Category) => c.checked).map((c: Category) => c.type).join(', ')} | ||
</h1> | ||
<span key="ep1Span"> | ||
<div className="categories-container"> | ||
{this.state.categories.map((c: Category) => { | ||
return ( | ||
<IgrCheckbox key={'checkbox-' + c.type} | ||
onChange={(e: IgrCheckboxChangeEventArgs) => this.categoriesChange(e, c.type)}> | ||
<span key={'cbSpan-' + c.type}>{c.type}</span> | ||
</IgrCheckbox> | ||
); | ||
})} | ||
</div> | ||
</span> | ||
</IgrExpansionPanel> | ||
<IgrExpansionPanel key="ep2"> | ||
<h1 slot="title" key="ep2Title"> | ||
Cost: $<span id="lowerCost">{this.state.cost.lower}</span> to $<span id="upperCost">{this.state.cost.upper}</span> | ||
</h1> | ||
<span key="ep2Span"> | ||
<IgrRangeSlider key="rangeSlider" min={0} max={1000} lower={this.state.cost.lower} upper={this.state.cost.upper} | ||
onChange={this.costRangeChange}> | ||
</IgrRangeSlider> | ||
</span> | ||
</IgrExpansionPanel> | ||
<IgrExpansionPanel key="ep3"> | ||
<h1 slot="title" key="ep3Title">Rating{this.state.rating && ': '}{this.state.rating}</h1> | ||
<span key="ep3Span"> | ||
<IgrRadioGroup key="radio" alignment="horizontal"> | ||
{[1, 2, 3, 4].map(rating => { | ||
return ( | ||
<IgrRadio key={`${rating}star`} name="rating" value={rating.toString()} onChange={this.ratingChange}> | ||
<IgrRating label={`${rating} star${rating > 1 ? 's' : ''} or more`} max={5} value={rating + 0.5} | ||
className="size-small" readOnly={true} key={`{r-${rating}}`}> | ||
</IgrRating> | ||
</IgrRadio> | ||
); | ||
})} | ||
</IgrRadioGroup> | ||
</span> | ||
</IgrExpansionPanel> | ||
<IgrExpansionPanel key="ep4"> | ||
<h1 slot="title" key="ep4Title">{this.state.time}</h1> | ||
<span key="ep4Span"> | ||
<IgrDateTimeInput className="size-small" key="dtInput" inputFormat="hh:mm tt" label="Arrive before" | ||
ref={this.dateTimeInputRef} onChange={this.timeChange}> | ||
<span key="sPrefix" slot="prefix"> | ||
<IgrIcon name="clock" collection="material" /> | ||
</span> | ||
<span key="sSuffix" slot="suffix" onClick={this.clearTime}> | ||
<IgrIcon name="clear" collection="material" /> | ||
</span> | ||
</IgrDateTimeInput> | ||
</span> | ||
</IgrExpansionPanel> | ||
</IgrAccordion> | ||
private categories = [ | ||
{ checked: false, type: "Bike" }, | ||
{ checked: false, type: "Motorcycle" }, | ||
{ checked: false, type: "Car" }, | ||
{ checked: false, type: "Taxi" }, | ||
{ checked: false, type: "Public Transport" }, | ||
]; | ||
|
||
private dateTimeInput: IgrDateTimeInput; | ||
|
||
constructor(props: any) { | ||
super(props); | ||
this.state = { | ||
categories: this.categories, | ||
cost: { lower: 200, upper: 800 }, | ||
rating: "", | ||
time: "Time", | ||
}; | ||
|
||
this.categoriesChange = this.categoriesChange.bind(this); | ||
this.costRangeChange = this.costRangeChange.bind(this); | ||
this.ratingChange = this.ratingChange.bind(this); | ||
this.timeChange = this.timeChange.bind(this); | ||
this.clearTime = this.clearTime.bind(this); | ||
this.dateTimeInputRef = this.dateTimeInputRef.bind(this); | ||
|
||
registerIconFromText("clear", clearIcon, "material"); | ||
registerIconFromText("clock", clockIcon, "material"); | ||
} | ||
|
||
public render(): JSX.Element { | ||
return ( | ||
<div id="root"> | ||
<div className="sample-wrapper"> | ||
<IgrAccordion> | ||
<IgrExpansionPanel key="ep1"> | ||
<h1 slot="title" key="ep1Title"> | ||
Categories | ||
{this.state.categories.some((c: Category) => c.checked) && ": "} | ||
{this.state.categories | ||
.filter((c: Category) => c.checked) | ||
.map((c: Category) => c.type) | ||
.join(", ")} | ||
</h1> | ||
<span key="ep1Span"> | ||
<div className="categories-container"> | ||
{this.state.categories.map((c: Category) => { | ||
return ( | ||
<IgrCheckbox | ||
key={"checkbox-" + c.type} | ||
onChange={(e: IgrCheckboxChangeEventArgs) => | ||
this.categoriesChange(e, c.type) | ||
} | ||
> | ||
<span key={"cbSpan-" + c.type}>{c.type}</span> | ||
</IgrCheckbox> | ||
); | ||
})} | ||
</div> | ||
</div> | ||
); | ||
</span> | ||
</IgrExpansionPanel> | ||
<IgrExpansionPanel key="ep2"> | ||
<h1 slot="title" key="ep2Title"> | ||
Cost: $<span id="lowerCost">{this.state.cost.lower}</span> to $ | ||
<span id="upperCost">{this.state.cost.upper}</span> | ||
</h1> | ||
<span key="ep2Span"> | ||
<IgrRangeSlider | ||
key="rangeSlider" | ||
min={0} | ||
max={1000} | ||
lower={this.state.cost.lower} | ||
upper={this.state.cost.upper} | ||
onChange={this.costRangeChange} | ||
></IgrRangeSlider> | ||
</span> | ||
</IgrExpansionPanel> | ||
<IgrExpansionPanel key="ep3"> | ||
<h1 slot="title" key="ep3Title"> | ||
Rating{this.state.rating && ": "} | ||
{this.state.rating} | ||
</h1> | ||
<span key="ep3Span"> | ||
<IgrRadioGroup key="radio" alignment="horizontal"> | ||
{[1, 2, 3, 4].map((rating) => { | ||
return ( | ||
<IgrRadio | ||
key={`${rating}star`} | ||
name="rating" | ||
value={rating.toString()} | ||
onChange={this.ratingChange} | ||
> | ||
<IgrRating | ||
label={`${rating} star${ | ||
rating > 1 ? "s" : "" | ||
} or more`} | ||
max={5} | ||
value={rating + 0.5} | ||
className="size-small" | ||
readOnly={true} | ||
key={`{r-${rating}}`} | ||
></IgrRating> | ||
</IgrRadio> | ||
); | ||
})} | ||
</IgrRadioGroup> | ||
</span> | ||
</IgrExpansionPanel> | ||
<IgrExpansionPanel key="ep4"> | ||
<h1 slot="title" key="ep4Title"> | ||
{this.state.time} | ||
</h1> | ||
<span key="ep4Span"> | ||
<IgrDateTimeInput | ||
className="size-small" | ||
key="dtInput" | ||
inputFormat="hh:mm tt" | ||
label="Arrive before" | ||
ref={this.dateTimeInputRef} | ||
onChange={this.timeChange} | ||
> | ||
<span key="sPrefix" slot="prefix"> | ||
<IgrIcon name="clock" collection="material" /> | ||
</span> | ||
<span key="sSuffix" slot="suffix" onClick={this.clearTime}> | ||
<IgrIcon name="clear" collection="material" /> | ||
</span> | ||
</IgrDateTimeInput> | ||
</span> | ||
</IgrExpansionPanel> | ||
</IgrAccordion> | ||
</div> | ||
</div> | ||
); | ||
} | ||
|
||
public categoriesChange(e: IgrCheckboxChangeEventArgs, type: string) { | ||
const categoryIndex = this.categories.findIndex((c) => c.type === type); | ||
if (categoryIndex === -1) { | ||
return; | ||
} | ||
|
||
public categoriesChange(e: IgrCheckboxChangeEventArgs, type: string) { | ||
const categoryIndex = this.categories.findIndex(c => c.type === type); | ||
if (categoryIndex === -1) { return; } | ||
let categoriesCopy = this.state.categories; | ||
categoriesCopy[categoryIndex].checked = e.detail.checked; | ||
this.setState({ | ||
categories: categoriesCopy | ||
}); | ||
let categoriesCopy = this.state.categories; | ||
categoriesCopy[categoryIndex].checked = e.detail.checked; | ||
this.setState({ | ||
categories: categoriesCopy, | ||
}); | ||
} | ||
|
||
public costRangeChange(e: IgrRangeSliderValueEventArgs) { | ||
this.setState({ | ||
cost: { lower: e.detail.lower, upper: e.detail.upper }, | ||
}); | ||
} | ||
|
||
public ratingChange(e: IgrRadioChangeEventArgs) { | ||
if (!e.detail.value) { | ||
return; | ||
} | ||
|
||
public costRangeChange(e: IgrRangeSliderValueEventArgs) { | ||
this.setState({ | ||
cost: { lower: e.detail.lower, upper: e.detail.upper } | ||
}); | ||
} | ||
|
||
public ratingChange(e: IgrRadioChangeEventArgs) { | ||
if (!e.detail.value) { return; } | ||
this.setState({ | ||
rating: `${+e.detail.value} star${+e.detail.value > 1 ? 's' : ''} or more` | ||
}); | ||
} | ||
|
||
public timeChange(e: IgrComponentDateValueChangedEventArgs) { | ||
const s = e.target as IgrDateTimeInput; | ||
const result = s.value !== null ? `Arrive before ${e.detail.toLocaleTimeString([], { hour: "2-digit", minute: "2-digit" })}` : 'Time'; | ||
this.setState({ | ||
time: result | ||
}); | ||
} | ||
|
||
public clearTime() { | ||
this.dateTimeInput.clear(); this.setState({ | ||
time: 'Time' | ||
}); | ||
} | ||
|
||
public dateTimeInputRef(input: IgrDateTimeInput) { | ||
if (!input) { return; } | ||
this.dateTimeInput = input; | ||
this.setState({ | ||
rating: `${+e.detail.value} star${ | ||
+e.detail.value > 1 ? "s" : "" | ||
} or more`, | ||
}); | ||
} | ||
|
||
public timeChange(e: IgrComponentDateValueChangedEventArgs) { | ||
const s = e.target as IgrDateTimeInput; | ||
const result = | ||
s.value !== null | ||
? `Arrive before ${e.detail.toLocaleTimeString([], { | ||
hour: "2-digit", | ||
minute: "2-digit", | ||
})}` | ||
: "Time"; | ||
this.setState({ | ||
time: result, | ||
}); | ||
} | ||
|
||
public clearTime() { | ||
this.dateTimeInput.clear(); | ||
this.setState({ | ||
time: "Time", | ||
}); | ||
} | ||
|
||
public dateTimeInputRef(input: IgrDateTimeInput) { | ||
if (!input) { | ||
return; | ||
} | ||
this.dateTimeInput = input; | ||
} | ||
} | ||
|
||
// rendering above class to the React DOM | ||
const root = ReactDOM.createRoot(document.getElementById('root')); | ||
// rendering above component to the React DOM | ||
const root = ReactDOM.createRoot(document.getElementById("root")); | ||
root.render(<AccordionCustomization />); |
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.
There are a lot of instances where
key
is set. We can now remove those, since it's no longer needed.