Skip to content

fix(ObjectPage): Don't crash in default mode with only 1 child provided #81

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

Merged
merged 1 commit into from
Aug 5, 2019
Merged

fix(ObjectPage): Don't crash in default mode with only 1 child provided #81

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
114 changes: 113 additions & 1 deletion packages/main/__karma_snapshots__/ObjectPage.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,66 @@
<header class="ObjectPageHeader--header---"><header class="ObjectPageHeader--titleBar---"><span class="ObjectPageHeader--container---"><h1 class="ObjectPageHeader--title---"></h1><span class="ObjectPageHeader--subTitle---"></span></span><span class="ObjectPageHeader--actions---"></span></header><div style="position:relative"><div class="ObjectPageHeader--headerContent---"></div></div></header><section class="ObjectPage--anchorBar---" role="navigation"><li class="ObjectPageAnchorButton--anchorButtonContainer---"><span class="ObjectPageAnchorButton--button--- ObjectPageAnchorButton--selected---"></span></li><li class="ObjectPageAnchorButton--anchorButtonContainer---"><span class="ObjectPageAnchorButton--button---"></span></li></section><section id="ObjectPageSections" class="ObjectPageContent--sectionsContainer---"><section id="ObjectPageSection-1" role="region"><div role="heading" class="ObjectPageSection--header---"><div class="ObjectPageSection--title--- ObjectPageSection--uppercase---"></div></div><div class="ObjectPageSection--sectionContent---"><div class="ObjectPageSection--sectionContentInner---">Test</div></div></section><div></div></section>
```

#### `Not crashing with 1 section`
#### `Not crashing with 1 section - Default Mode`

```
<ThemeProvider withToastContainer={false}>
<JssProvider generateId={[Function]}>
<ThemeProvider theme={{...}}>
<ObjectPage title="" subTitle="" image={{...}} imageShapeCircle={false} headerActions={{...}} renderHeaderContent={{...}} mode="Default" onSelectedSectionChanged={[Function: onSelectedSectionChanged]} showHideHeaderButton={false} selectedSectionId={{...}} noHeader={false}>
<div data-component-name="ObjectPage" slot={[undefined]} className="ObjectPage--objectPage---" style={[undefined]} title={[undefined]}>
<ObjectPageHeader title="" subTitle="" image={{...}} headerActions={{...}} renderHeaderContent={{...}} imageShapeCircle={false} showHideHeaderButton={false}>
<header className="ObjectPageHeader--header---">
<header className="ObjectPageHeader--titleBar---">
<span className="ObjectPageHeader--container---">
<h1 className="ObjectPageHeader--title---" />
<span className="ObjectPageHeader--subTitle---" />
</span>
<span className="ObjectPageHeader--actions---" />
</header>
<div style={{...}}>
<div className="ObjectPageHeader--headerContent---" />
</div>
</header>
</ObjectPageHeader>
<section className="ObjectPage--anchorBar---" role="navigation">
<ObjectPageAnchorButton section={{...}} index={0} selected={true} mode="Default" onSectionSelected={[Function]} onSubSectionSelected={[Function]}>
<li className="ObjectPageAnchorButton--anchorButtonContainer---">
<Link to="ObjectPageSection-1" containerId="ObjectPageSections" spy={true} activeClass="ObjectPageAnchorButton--selected---" onSetActive={[Function]} duration={400} smooth={true} offset={0}>
<LinkElement className="ObjectPageAnchorButton--selected---" onClick={[Function]}>
<a className="ObjectPageAnchorButton--selected---" onClick={[Function]}>
<span className="ObjectPageAnchorButton--button---" />
</a>
</LinkElement>
</Link>
</li>
</ObjectPageAnchorButton>
</section>
<ObjectPageContent fillerRef={{...}}>
<section id="ObjectPageSections" className="ObjectPageContent--sectionsContainer---">
<ObjectPageSection id="1" title="" isSection={true} titleUppercase={true}>
<section id="ObjectPageSection-1" role="region" className={[undefined]} style={[undefined]} title={[undefined]}>
<div role="heading" className="ObjectPageSection--header---">
<div className="ObjectPageSection--title--- ObjectPageSection--uppercase---" />
</div>
<div className="ObjectPageSection--sectionContent---">
<div className="ObjectPageSection--sectionContentInner---">
Test
</div>
</div>
</section>
</ObjectPageSection>
<div />
</section>
</ObjectPageContent>
</div>
</ObjectPage>
</ThemeProvider>
</JssProvider>
</ThemeProvider>
```

#### `Not crashing with 1 section - IconTabBar Mode`

```
<ThemeProvider withToastContainer={false}>
Expand Down Expand Up @@ -891,3 +950,56 @@
</ThemeProvider>
```

#### `Not crashing with 1 section`

```
<ThemeProvider withToastContainer={false}>
<JssProvider generateId={[Function]}>
<ThemeProvider theme={{...}}>
<ObjectPage mode="IconTabBar" title="" subTitle="" image={{...}} imageShapeCircle={false} headerActions={{...}} renderHeaderContent={{...}} onSelectedSectionChanged={[Function: onSelectedSectionChanged]} showHideHeaderButton={false} selectedSectionId={{...}} noHeader={false}>
<div data-component-name="ObjectPage" slot={[undefined]} className="ObjectPage--objectPage---" style={[undefined]} title={[undefined]}>
<ObjectPageHeader title="" subTitle="" image={{...}} headerActions={{...}} renderHeaderContent={{...}} imageShapeCircle={false} showHideHeaderButton={false}>
<header className="ObjectPageHeader--header---">
<header className="ObjectPageHeader--titleBar---">
<span className="ObjectPageHeader--container---">
<h1 className="ObjectPageHeader--title---" />
<span className="ObjectPageHeader--subTitle---" />
</span>
<span className="ObjectPageHeader--actions---" />
</header>
<div style={{...}}>
<div className="ObjectPageHeader--headerContent---" />
</div>
</header>
</ObjectPageHeader>
<section className="ObjectPage--anchorBar---" role="navigation">
<ObjectPageAnchorButton section={{...}} index={0} selected={true} mode="IconTabBar" onSectionSelected={[Function]} onSubSectionSelected={[Function]}>
<li className="ObjectPageAnchorButton--anchorButtonContainer---">
<span onClick={[Function]} className="ObjectPageAnchorButton--button--- ObjectPageAnchorButton--selected---" />
</li>
</ObjectPageAnchorButton>
</section>
<ObjectPageContent fillerRef={{...}}>
<section id="ObjectPageSections" className="ObjectPageContent--sectionsContainer---">
<ObjectPageSection id="1" title="" isSection={true} titleUppercase={true}>
<section id="ObjectPageSection-1" role="region" className={[undefined]} style={[undefined]} title={[undefined]}>
<div role="heading" className="ObjectPageSection--header---">
<div className="ObjectPageSection--title--- ObjectPageSection--uppercase---" />
</div>
<div className="ObjectPageSection--sectionContent---">
<div className="ObjectPageSection--sectionContentInner---">
Test
</div>
</div>
</section>
</ObjectPageSection>
<div />
</section>
</ObjectPageContent>
</div>
</ObjectPage>
</ThemeProvider>
</JssProvider>
</ThemeProvider>
```

12 changes: 11 additions & 1 deletion packages/main/src/components/ObjectPage/ObjectPage.karma.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,17 @@ describe('ObjectPage', () => {
expect(wrapper.html()).to.matchSnapshot();
});

it('Not crashing with 1 section', () => {
it('Not crashing with 1 section - Default Mode', () => {
const wrapper = mountThemedComponent(
<ObjectPage>
<ObjectPageSection id={'1'}>Test</ObjectPageSection>
</ObjectPage>
);

expect(wrapper.debug()).to.matchSnapshot();
});

it('Not crashing with 1 section - IconTabBar Mode', () => {
const wrapper = mountThemedComponent(
<ObjectPage mode={ObjectPageMode.IconTabBar}>
<ObjectPageSection id={'1'}>Test</ObjectPageSection>
Expand Down
3 changes: 2 additions & 1 deletion packages/main/src/components/ObjectPage/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,8 @@ const ObjectPage: FC<ObjectPagePropTypes> = forwardRef((props: ObjectPagePropTyp

useEffect(() => {
if (mode === ObjectPageMode.Default) {
scrollToSectionById(children[selectedSectionIndex].props.id, selectedSectionIndex);
// @ts-ignore
scrollToSectionById(Children.toArray(children)[selectedSectionIndex].props.id, selectedSectionIndex);
}
if (mode === ObjectPageMode.IconTabBar) {
adjustDummyDivHeight();
Expand Down