Skip to content

Commit

Permalink
[Tabs] Fix SSR regression
Browse files Browse the repository at this point in the history
  • Loading branch information
oliviertassinari committed Dec 3, 2017
1 parent 4581879 commit 8a1b92f
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 7 deletions.
4 changes: 2 additions & 2 deletions src/Tabs/TabIndicator.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export const styles = (theme: Object) => ({
});

export type IndicatorStyle = {
left: number,
width: number,
left?: number,
width?: number,
};

export type ProvidedProps = {
Expand Down
5 changes: 1 addition & 4 deletions src/Tabs/Tabs.js
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,7 @@ class Tabs extends React.Component<ProvidedProps & Props, State> {
};

state = {
indicatorStyle: {
left: 0,
width: 0,
},
indicatorStyle: {},
scrollerStyle: {
marginBottom: 0,
},
Expand Down
21 changes: 20 additions & 1 deletion src/Tabs/Tabs.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import React from 'react';
import { assert } from 'chai';
import { spy, stub, useFakeTimers } from 'sinon';
import scroll from 'scroll';
import { ShallowWrapper } from 'enzyme';
import { createShallow, createMount, getClasses, unwrap } from '../test-utils';
import consoleErrorMock from '../../test/utils/consoleErrorMock';
import Tabs from './Tabs';
Expand Down Expand Up @@ -162,6 +163,24 @@ describe('<Tabs />', () => {
assert.strictEqual(wrapper2.find(TabIndicator).props().style.width, 0);
});

it('should work server-side', () => {
const wrapper2 = shallow(
<Tabs width="md" onChange={noop} value={1}>
<Tab />
<Tab />
</Tabs>,
{ disableLifecycleMethods: true },
);
const indicator = new ShallowWrapper(
wrapper2
.find(Tab)
.at(1)
.props().indicator,
wrapper2,
);
assert.deepEqual(indicator.props().style, {});
});

it('should let the selected <Tab /> render the indicator', () => {
const wrapper2 = shallow(
<Tabs width="md" onChange={noop} value={1}>
Expand Down Expand Up @@ -246,7 +265,7 @@ describe('<Tabs />', () => {
<Tab />
</Tabs>,
);
assert.strictEqual(consoleErrorMock.callCount(), 2);
assert.strictEqual(consoleErrorMock.callCount(), 3);
assert.strictEqual(
consoleErrorMock.args()[0][0],
'Warning: Material-Next: the value provided `2` is invalid',
Expand Down

0 comments on commit 8a1b92f

Please sign in to comment.