Skip to content

Commit

Permalink
fix(SubModelHidingChildren): Unnamed children should be skipped not o…
Browse files Browse the repository at this point in the history 
…mitted (#377)

Co-authored-by: Mitchell Lee <mitchlee@amazon.com>
  • Loading branch information
@TheEvilDev
TheEvilDev and Mitchell Lee committed Nov 17, 2022
1 parent a835bcd commit 46be1c4
Show file tree
Hide file tree
Showing 5 changed files with 309 additions and 10 deletions.
3 changes: 2 additions & 1 deletion ...nents/panels/SceneHierarchyPanel/components/SceneHierarchyTree/SceneHierarchyTreeItem.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@ const SceneHierarchyTreeItem: FC<SceneHierarchyTreeItemProps> = ({
const { getSceneNodeByRef } = useSceneDocument(sceneComposerId);
const node = getSceneNodeByRef(key);
const isSubModel = !!findComponentByType(node, KnownComponentType.SubModelRef);
const componentRef = findComponentByType(node, KnownComponentType.ModelRef)?.ref;
const { searchTerms } = useSceneHierarchyData();
const isSearching = searchTerms !== '';

Expand Down Expand Up @@ -101,7 +102,7 @@ const SceneHierarchyTreeItem: FC<SceneHierarchyTreeItemProps> = ({
</React.Fragment>
))}
{showSubModel && !isSearching && (
<SubModelTree parentRef={key} expanded={false} object3D={model!} selectable />
<SubModelTree parentRef={key} expanded={false} object3D={model!} componentRef={componentRef!} selectable />
)}
</EnhancedTree>
)}
Expand Down
4 changes: 3 additions & 1 deletion ...onents/panels/SceneHierarchyPanel/components/SubModelTree/__tests__/SubModelTree.spec.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,8 @@ const defaultObject = {
node(3, 'Node 3', [], false),
node(4),
node(5, 'Node 5', [node(6, 'Child 1'), node(7, 'Child 2'), node(8, 'Child 3')]),
node(9, '', [node(10, 'Child 4'), node(11, 'Child 5'), node(12, 'Child 6')]),
node(13, 'Composer Added', [node(14, 'Child 7'), node(15, 'Child 8'), node(16, 'Child 9')], false),
] as unknown as Object3D<Event>[],
} as unknown as Object3D<Event>,
parentRef: '112',
Expand All @@ -61,7 +63,7 @@ describe('SubModelTree', () => {

const objectNullName = {
...defaultObject,
name: null,
name: undefined,
};

const { container } = render(<SubModelTree {...objectNullName} />);
Expand Down
270 changes: 270 additions & 0 deletions ...HierarchyPanel/components/SubModelTree/__tests__/__snapshots__/SubModelTree.spec.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,96 @@ exports[`SubModelTree should not render a SubModel Tree if isOriginal flag is fa
</li>
</ol>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 4
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 5
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 6
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 7
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 8
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 9
</div>
</label>
</li>
</ol>
</li>
</div>
Expand Down Expand Up @@ -299,6 +389,96 @@ exports[`SubModelTree should not render a SubModel Tree if name is null 1`] = `
</li>
</ol>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 4
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 5
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 6
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 7
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 8
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 9
</div>
</label>
</li>
</ol>
</li>
</div>
Expand Down Expand Up @@ -431,6 +611,96 @@ exports[`SubModelTree should render appropriately based on the object 1`] = `
</li>
</ol>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 4
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 5
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 6
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 7
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 8
</div>
</label>
</li>
<li
class="tm-tree-item tm-sub-model"
role="treeitem"
>
<label
aria-selected="false"
class="tm-tree-item-inner"
>
<div
data-mocked="SubModelTreeItemLabel"
>
Child 9
</div>
</label>
</li>
</ol>
</li>
</div>
Expand Down

0 comments on commit 46be1c4

Please sign in to comment.