Skip to content
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.

Sign up for GitHub

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

fixed scene tree not sticking #12754

Merged
merged 3 commits into from
Jul 19, 2022
Merged

fixed scene tree not sticking #12754

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96d38d7
fixed scene tree not sticking
amritanarasimhan Jul 15, 2022
981bfb5
got rid of unwanted code
amritanarasimhan Jul 15, 2022
92c2fb2
small code change
amritanarasimhan Jul 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 14 additions & 11 deletions packages/tools/guiEditor/src/components/sceneExplorer/treeItemSelectableComponent.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ export interface ITreeItemSelectableComponentProps {
}

export interface ITreeItemSelectableComponentState {
isExpanded: boolean;
dragOver: boolean;
isSelected: boolean;
isHovered: boolean;
Expand All @@ -45,7 +46,13 @@ export class TreeItemSelectableComponent extends React.Component<ITreeItemSelect
constructor(props: ITreeItemSelectableComponentProps) {
super(props);

this.state = { dragOver: false, dragOverLocation: DragOverLocation.NONE, isHovered: false, isSelected: this.props.selectedEntities.includes(this.props.entity) };
this.state = {
isExpanded: true,
dragOver: false,
dragOverLocation: DragOverLocation.NONE,
isHovered: false,
isSelected: this.props.selectedEntities.includes(this.props.entity),
};

this._onSelectionChangedObservable = props.globalState.onSelectionChangedObservable.add(() => {
this.setState({ isSelected: this.props.globalState.selectedControls.includes(this.props.entity) });
Expand All @@ -60,7 +67,7 @@ export class TreeItemSelectableComponent extends React.Component<ITreeItemSelect
}

switchExpandedState(): void {
this.props.entity.reservedDataStore.setExpandedState(!this.props.entity.reservedDataStore.isExpanded);
this.setState({ isExpanded: !this.state.isExpanded });
}

shouldComponentUpdate(nextProps: ITreeItemSelectableComponentProps, nextState: { isSelected: boolean }) {
Expand Down Expand Up @@ -112,6 +119,7 @@ export class TreeItemSelectableComponent extends React.Component<ITreeItemSelect
if (item.name == "Art-Board-Background") {
return null;
}

return (
<TreeItemSelectableComponent
globalState={this.props.globalState}
Expand Down Expand Up @@ -140,16 +148,10 @@ export class TreeItemSelectableComponent extends React.Component<ITreeItemSelect
};
const entity = this.props.entity;

if (!entity.reservedDataStore) {
entity.reservedDataStore = {
isExpanded: true,
setExpandedState: (expanded: boolean) => (entity.reservedDataStore.isExpanded = expanded),
};
}
const isExpanded = entity.reservedDataStore.isExpanded || Tools.LookForItems(this.props.entity, this.props.selectedEntities);
entity.reservedDataStore.isExpanded = isExpanded;
const isExpanded = this.state.isExpanded || Tools.LookForItems(this.props.entity, this.props.selectedEntities);
RaananW marked this conversation as resolved.
Show resolved Hide resolved

const chevron = isExpanded ? <img src={expandedIcon} className="icon" /> : <img src={collapsedIcon} className="icon" />;

const children = entity.getClassName() === "MultiMaterial" ? [] : Tools.SortAndFilter(entity, entity.getChildren ? entity.getChildren() : entity.children);
const hasChildren = children.length > 0;

Expand Down Expand Up @@ -217,10 +219,11 @@ export class TreeItemSelectableComponent extends React.Component<ITreeItemSelect
}}
>
{hasChildren && (
<div className="arrow icon" onClick={() => this.switchExpandedState()}>
<div className="arrow" onClick={() => this.switchExpandedState()}>
{chevron}
</div>
)}

<ControlTreeItemComponent
globalState={this.props.globalState}
extensibilityGroups={this.props.extensibilityGroups}
Expand Down