Skip to content

Commit 3c51096

Browse files
authored
Use flex styles to position text/icon in header instead of float so that they position correctly in moving UI. (#939)
1 parent 190612c commit 3c51096

File tree

9 files changed

+27
-27
lines changed

9 files changed

+27
-27
lines changed

code-gen-library/HierarchicalGridPinHeaderTemplate/Blazor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ igRegisterScript("HierarchicalGridPinHeaderTemplate", (ctx) => {
44
window.toggleColumnPin = function toggleColumnPin(column) {
55
column.pinned = !column.pinned;
66
}
7-
return html`<div>
8-
<span style="float:left">${ctx.column.field}</span>
9-
<span style="float:right" @click=${() => toggleColumnPin(ctx.column)}>📌</span>
7+
return html`<div style="display:flex;">
8+
<span>${ctx.column.field}</span>
9+
<span style="margin-left: auto;" @click=${() => toggleColumnPin(ctx.column)}>📌</span>
1010
</div>`;
1111
}, false);
1212
//end template

code-gen-library/HierarchicalGridPinHeaderTemplate/React.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ export class HierarchicalGridPinHeaderTemplate {
99
public hierarchicalGridPinHeaderTemplate = (props: {dataContext: IgrColumnTemplateContext}) => {
1010
const column = (props.dataContext as any).column;
1111
return (
12-
<div>
13-
<span style={{float: 'left'}}>{column.field}</span>
14-
<span style={{float: 'right'}} onClick={(e: any) => this.toggleColumnPin(column)}>📌</span>
12+
<div style={{display: 'flex'}}>
13+
<span>{column.field}</span>
14+
<span style={{marginLeft: 'auto'}} onClick={(e: any) => this.toggleColumnPin(column)}>📌</span>
1515
</div>
1616
);
1717
}

code-gen-library/HierarchicalGridPinHeaderTemplate/WebComponents.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export class HierarchicalGridPinHeaderTemplate {
1111
public hierarchicalGridPinHeaderTemplate = (ctx: IgcColumnTemplateContext) => {
1212

1313
const column = (ctx as any).column;
14-
return html`<div>
15-
<span style="float:left">${column.field}</span>
16-
<span style="float:right" @click=${(e: any) => this.toggleColumnPin(column)}>📌</span>
14+
return html`<div style="display:flex;">
15+
<span>${column.field}</span>
16+
<span style="margin-left: auto;" @click=${(e: any) => this.toggleColumnPin(column)}>📌</span>
1717
</div>`;
1818
};
1919
//end content

code-gen-library/WebGridPinHeaderTemplate/Blazor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ igRegisterScript("WebGridPinHeaderTemplate", (ctx) => {
77
col.pinned = !col.pinned;
88
grid.markForCheck();
99
}
10-
return html`<div>
11-
<span style="float:left">${ctx.column.field}</span>
12-
<span style="float:right" onpointerdown='toggleColumnPin("${ctx.column.field}")'>📌</span>
10+
return html`<div style="display:flex;">
11+
<span>${ctx.column.field}</span>
12+
<span style="margin-left: auto;" onpointerdown='toggleColumnPin("${ctx.column.field}")'>📌</span>
1313
</div>`;
1414
}, false);
1515
//end template

code-gen-library/WebGridPinHeaderTemplate/React.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export class WebGridPinHeaderTemplateComponent {
88
public webGridPinHeaderTemplate = (props: {dataContext: IgrColumnTemplateContext}) => {
99
const column = (props.dataContext as any).column;
1010
return (
11-
<div>
12-
<span style={{float: 'left'}}>{column.field}</span>
13-
<span style={{float: 'right'}} onPointerDown={(e: any) => this.toggleColumnPin(column.field)}>📌</span>
11+
<div style={{display: 'flex'}}>
12+
<span>{column.field}</span>
13+
<span style={{marginLeft: 'auto'}} onPointerDown={(e: any) => this.toggleColumnPin(column.field)}>📌</span>
1414
</div>
1515
);
1616
}

code-gen-library/WebGridPinHeaderTemplate/WebComponents.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export class WebGridPinHeaderTemplateComponent {
1111
public webGridPinHeaderTemplate = (ctx: IgcColumnTemplateContext) => {
1212

1313
const column = (ctx as any).column;
14-
return html`<div>
15-
<span style="float:left">${column.field}</span>
16-
<span style="float:right" @pointerdown=${(e: any) => this.toggleColumnPin(column.field)}>📌</span>
14+
return html`<div style="display:flex;">
15+
<span>${column.field}</span>
16+
<span style="margin-left: auto;" @pointerdown=${(e: any) => this.toggleColumnPin(column.field)}>📌</span>
1717
</div>`;
1818
    };
1919
//end content

code-gen-library/WebTreeGridPinHeaderTemplate/Blazor.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ igRegisterScript("WebTreeGridPinHeaderTemplate", (ctx) => {
77
col.pinned = !col.pinned;
88
grid.markForCheck();
99
}
10-
return html`<div>
11-
<span style="float:left">${ctx.column.field}</span>
12-
<span style="float:right" onpointerdown='toggleColumnPin("${ctx.column.field}")'>📌</span>
10+
return html`<div style="display:flex;">
11+
<span>${ctx.column.field}</span>
12+
<span style="margin-left: auto;" onpointerdown='toggleColumnPin("${ctx.column.field}")'>📌</span>
1313
</div>`;
1414
}, false);
1515
//end template

code-gen-library/WebTreeGridPinHeaderTemplate/React.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ export class WebTreeGridPinHeaderTemplate {
88
public webTreeGridPinHeaderTemplate = (props: {dataContext: IgrColumnTemplateContext}) => {
99
const column = (props.dataContext as any).column;
1010
return (
11-
<div>
12-
<span style={{float: 'left'}}>{column.field}</span>
13-
<span style={{float: 'right'}} onPointerDown={(e: any) => this.toggleColumnPin(column.field)}>📌</span>
11+
<div style={{display: 'flex'}}>
12+
<span>{column.field}</span>
13+
<span style={{marginLeft: 'auto'}} onPointerDown={(e: any) => this.toggleColumnPin(column.field)}>📌</span>
1414
</div>
1515
);
1616
}

code-gen-library/WebTreeGridPinHeaderTemplate/WebComponents.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ export class WebTreeGridPinHeaderTemplate {
1111
public webTreeGridPinHeaderTemplate = (ctx: IgcColumnTemplateContext) => {
1212

1313
const column = (ctx as any).column;
14-
return html`<div>
15-
<span style="float:left">${column.field}</span>
16-
<span style="float:right" @pointerdown=${(e: any) => this.toggleColumnPin(column.field)}>📌</span>
14+
return html`<div style="display:flex;">
15+
<span>${column.field}</span>
16+
<span style="margin-left: auto;" @pointerdown=${(e: any) => this.toggleColumnPin(column.field)}>📌</span>
1717
</div>`;
1818
    };
1919
//end content

0 commit comments

Comments
 (0)