Skip to content

Commit f60f010

Browse files
authored
Dpetev/v19 misc fixes (#799)
1 parent 8c7327f commit f60f010

File tree

7 files changed

+24
-27
lines changed

7 files changed

+24
-27
lines changed

samples/grids/hierarchical-grid/cell-selection-mode/src/index.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,8 @@ export default class Sample extends React.Component<any, any> {
152152
}
153153

154154
public webRowIslandCellSelectionChange(sender: any, args: IgrPropertyEditorPropertyDescriptionChangedEventArgs): void {
155-
this.hierarchicalGrid.contentChildLayoutList[0].cellSelection = args.newValue.toLocaleLowerCase();
155+
const rowIsland = document.getElementsByTagName("igc-row-island")[0] as IgrRowIsland;
156+
rowIsland.cellSelection = args.newValue.toLocaleLowerCase();
156157
}
157158

158159
}

samples/grids/hierarchical-grid/row-pinning-extra-column/src/index.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -273,19 +273,17 @@ export default class Sample extends React.Component<any, any> {
273273
}
274274

275275
public webHierarchicalGridChangePinningConfig(sender: any, args: IgrPropertyEditorPropertyDescriptionChangedEventArgs): void {
276-
var newPinningPosition = args.newValue === "Top" ? RowPinningPosition.Top : RowPinningPosition.Bottom;
277-
var grid = this.grid;
278-
grid.pinning.rows = newPinningPosition;
279-
var rowIsland1 = grid.contentChildLayoutList.filter(e => e.childDataKey == 'Albums');
280-
rowIsland1[0].pinning.rows = newPinningPosition;
281-
var rowIsland2 = rowIsland1[0].contentChildLayoutList.filter(e => e.childDataKey == 'Songs');
282-
if(rowIsland2[0]) {
283-
rowIsland2[0].pinning.rows = newPinningPosition;
276+
const rows = args.newValue === "Top" ? RowPinningPosition.Top : RowPinningPosition.Bottom;
277+
const columns = ColumnPinningPosition.End;
278+
this._pinningConfig1 = { rows, columns };
279+
this._pinningConfig2 = { rows, columns };
280+
if ('_pinningConfig3' in this) {
281+
this._pinningConfig3 = { rows, columns };
284282
}
285-
var rowIsland3 = grid.contentChildLayoutList.filter(e => e.childDataKey == 'Tours');
286-
if(rowIsland3[0]) {
287-
rowIsland3[0].pinning.rows = newPinningPosition
283+
if ('_pinningConfig4' in this) {
284+
this._pinningConfig4 = { rows, columns };
288285
}
286+
this.forceUpdate(); // due to not using state
289287
}
290288

291289
public webHierarchicalGridRowPinCellTemplate = (e: {dataContext: IgrCellTemplateContext}) => {

samples/grids/hierarchical-grid/row-pinning-options/src/index.tsx

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,17 @@ export default class Sample extends React.Component<any, any> {
187187
}
188188

189189
public webHierarchicalGridChangePinningConfig(sender: any, args: IgrPropertyEditorPropertyDescriptionChangedEventArgs): void {
190-
var newPinningPosition = args.newValue === "Top" ? RowPinningPosition.Top : RowPinningPosition.Bottom;
191-
var grid = this.grid;
192-
grid.pinning.rows = newPinningPosition;
193-
var rowIsland1 = grid.contentChildLayoutList.filter(e => e.childDataKey == 'Albums');
194-
rowIsland1[0].pinning.rows = newPinningPosition;
195-
var rowIsland2 = rowIsland1[0].contentChildLayoutList.filter(e => e.childDataKey == 'Songs');
196-
if(rowIsland2[0]) {
197-
rowIsland2[0].pinning.rows = newPinningPosition;
190+
const rows = args.newValue === "Top" ? RowPinningPosition.Top : RowPinningPosition.Bottom;
191+
const columns = ColumnPinningPosition.End;
192+
this._pinningConfig1 = { rows, columns };
193+
this._pinningConfig2 = { rows, columns };
194+
if ('_pinningConfig3' in this) {
195+
this._pinningConfig3 = { rows, columns };
198196
}
199-
var rowIsland3 = grid.contentChildLayoutList.filter(e => e.childDataKey == 'Tours');
200-
if(rowIsland3[0]) {
201-
rowIsland3[0].pinning.rows = newPinningPosition
197+
if ('_pinningConfig4' in this) {
198+
this._pinningConfig4 = { rows, columns };
202199
}
200+
this.forceUpdate(); // due to not using state
203201
}
204202

205203
public webHierarchicalGridPinRowOnRendered(): void {

samples/inputs/dropdown/target/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export default class DropDownTarget extends React.Component<any, any> {
4141

4242
public onClick(event: any) {
4343
if(this.dropdownRef){
44-
this.dropdownRef.toggleTarget(event.i.nativeElement);
44+
this.dropdownRef.toggle(event.i.nativeElement);
4545
}
4646
}
4747
}

samples/inputs/radio/label/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ export default class RadioLabel extends React.Component<any, any> {
2424
<IgrRadio
2525
name="fruit"
2626
labelPosition="before"
27-
ariaLabelledby="radio-label"
27+
aria-labelledby="radio-label"
2828
value="orange">
2929
</IgrRadio>
3030
</div>

samples/layouts/accordion/customization/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ export default class AccordionCustomization extends React.Component<any, any> {
101101
return (
102102
<IgrRadio key={`${rating}star`} name="rating" value={rating.toString()} onChange={this.ratingChange}>
103103
<IgrRating label={`${rating} star${rating > 1 ? 's' : ''} or more`} max={5} value={rating + 0.5}
104-
className="size-small" readonly key={`{r-${rating}}`}>
104+
className="size-small" readOnly={true} key={`{r-${rating}}`}>
105105
</IgrRating>
106106
</IgrRadio>
107107
);

samples/layouts/card/styling/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ export default class CardStyling extends React.Component<any, any> {
2727
<div className="container sample center">
2828
<div className="card-wrapper">
2929
<IgrCard>
30-
<IgrCardMedia key="media" height="180px">
30+
<IgrCardMedia key="media">
3131
<img key="mediaImg" src="https://images.unsplash.com/photo-1541516160071-4bb0c5af65ba?ixlib=rb-1.2.1&ixid=eyJhcHBfaWQiOjEyMDd9&auto=format&fit=crop&w=1950&q=80"></img>
3232
</IgrCardMedia>
3333

0 commit comments

Comments
 (0)