Skip to content

Commit d818fc6

Browse files
fix issues related to aligment on icon due to removal of React.fragment
fix issues related to aligment on icon due to removal of React.fragment Co-Authored-By: Nanddeep Nachan <[email protected]>
1 parent 92c26ea commit d818fc6

File tree

3 files changed

+17
-17
lines changed

3 files changed

+17
-17
lines changed

src/controls/treeView/TreeItem.tsx

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -158,30 +158,30 @@ export default class TreeItem extends React.Component<ITreeItemProps, ITreeItemS
158158
else {
159159
return (
160160
// Default rendering of tree item
161-
<span>
161+
<div
162+
className={styles.labels}
163+
onClick={(e) => {
164+
165+
if (this.props.selectionMode != TreeViewSelectionMode.None && item.selectable != false) {
166+
e.stopPropagation();
167+
if (!item.disabled) {
168+
this._itemSelected(e, !this.state.selected);
169+
}
170+
}}}>
162171
{
163172
this.props.showCheckboxes && item.selectable == false && !item.children &&
164173
<span className={styles.blankspace}>&nbsp;</span>
165174
}
166175
{
167176
// Rendering when item has iconProps
168177
item.iconProps &&
169-
<span>
178+
<span>
170179
<Icon className={styles.icon} iconName={item.iconProps.iconName} style={item.iconProps.style} />
171180
&nbsp;
172181
</span>
173182
}
174-
<div
175-
className={styles.labels}
176-
onClick={(e) => {
177-
debugger;
178-
if (this.props.selectionMode != TreeViewSelectionMode.None && item.selectable != false) {
179-
e.stopPropagation();
180-
if (!item.disabled) {
181-
this._itemSelected(e, !this.state.selected);
182-
}
183-
}}}>
184-
<span>{item.label}</span>
183+
184+
{item.label}
185185
{
186186
// Render sublabel
187187
item.subLabel &&
@@ -190,7 +190,7 @@ export default class TreeItem extends React.Component<ITreeItemProps, ITreeItemS
190190
</div>
191191
}
192192
</div>
193-
</span>
193+
194194
);
195195
}
196196
}

src/controls/treeView/TreeView.module.scss

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@
6161

6262
.labels {
6363
line-height: 18px;
64-
display: flex;
65-
flex-direction: column;
64+
//display: flex;
65+
//flex-direction: column;
6666
.itemLabel {
6767
padding: 0;
6868
}

src/webparts/controlsTest/components/ControlsTest.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -941,7 +941,7 @@ export default class ControlsTest extends React.Component<IControlsTestProps, IC
941941
<TreeView items={this.treeitems}
942942
defaultExpanded={false}
943943
selectionMode={TreeViewSelectionMode.Multiple}
944-
showCheckboxes={false}
944+
showCheckboxes={true}
945945
treeItemActionsDisplayMode={TreeItemActionsDisplayMode.ContextualMenu}
946946
defaultSelectedKeys={['R2', '6']}
947947
onExpandCollapse={this.onExpandCollapseTree}

0 commit comments

Comments
 (0)