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

Jump to bottom

fix(react-core): remove redundant markup elements #544

Merged
merged 2 commits into from
Dec 4, 2017
Merged

fix(react-core): remove redundant markup elements #544

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d27646f
fix(react-core): remove redundant markup elements
kvet Dec 1, 2017
17af529
Merge branch 'master' into switch-to-fragments
kvet Dec 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/dx-react-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@
"eslint-plugin-react": "^7.4.0",
"jest": "^21.2.1",
"raf": "^3.4.0",
"react": "^16.1.1",
"react-dom": "^16.1.1",
"react-test-renderer": "^16.1.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-license": "^0.5.0",
Expand All @@ -78,7 +78,7 @@
"prop-types": "^15.6.0"
},
"peerDependencies": {
"react": "^15.6.1 || ^16.0.0",
"react-dom": "^15.6.1 || ^16.0.0"
"react": "^16.2.0",
"react-dom": "^16.2.0"
}
}
4 changes: 2 additions & 2 deletions packages/dx-react-core/src/plugged/plugin-host.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,13 @@ export class PluginHost extends React.PureComponent {
const { children } = this.props;

return (
<div>
<React.Fragment>
<PluginIndexer>
<Template name="root" />
{children}
</PluginIndexer>
<TemplatePlaceholder name="root" />
</div>
</React.Fragment>
);
}
}
Expand Down
4 changes: 2 additions & 2 deletions packages/dx-react-core/src/plugged/plugin-indexer.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const PluginIndexer = (
{ children },
{ positionContext },
) => (
<div style={{ display: 'none' }}>
<React.Fragment>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What about display: none? Is it unnecessary here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fragment is an virtual element. It will not be present in DOM.

{
React.Children.map(children, (child, index) => {
if (!child || !child.type) return child;
Expand All @@ -32,7 +32,7 @@ export const PluginIndexer = (
);
})
}
</div>
</React.Fragment>
);

PluginIndexer.propTypes = {
Expand Down
3 changes: 1 addition & 2 deletions packages/dx-react-core/src/plugged/template-placeholder.test.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,8 +65,7 @@ describe('TemplatePlaceholder', () => {
const tree = mount(<Test text="old" />);

tree.setProps({ text: 'new' });

expect(tree.render().find('h1').text())
expect(tree.find('h1').text())
.toBe('new');
});

Expand Down
6 changes: 3 additions & 3 deletions packages/dx-react-demos/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,9 +38,9 @@
"material-ui": "1.0.0-beta.20",
"material-ui-icons": "1.0.0-beta.17",
"prop-types": "^15.6.0",
"react": "^16.1.1",
"react": "^16.2.0",
"react-bootstrap": "^0.31.5",
"react-dom": "^16.1.1",
"react-dom": "^16.2.0",
"react-frame-component": "^2.0.0",
"react-redux": "^5.0.6",
"react-router-dom": "^4.2.2",
Expand Down Expand Up @@ -70,7 +70,7 @@
"jest": "^21.2.1",
"node-static": "^0.7.10",
"raf": "^3.4.0",
"react-test-renderer": "^16.1.1",
"react-test-renderer": "^16.2.0",
"source-map-loader": "^0.2.3",
"style-loader": "^0.19.0",
"webpack": "^3.8.1",
Expand Down
8 changes: 4 additions & 4 deletions packages/dx-react-grid-bootstrap3/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,10 @@
"eslint-plugin-react": "^7.4.0",
"jest": "^21.2.1",
"raf": "^3.4.0",
"react": "^16.1.1",
"react": "^16.2.0",
"react-bootstrap": "^0.31.5",
"react-dom": "^16.1.1",
"react-test-renderer": "^16.1.1",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-license": "^0.5.0",
Expand All @@ -88,7 +88,7 @@
"@devexpress/dx-grid-core": "1.0.0-beta.1",
"@devexpress/dx-react-core": "1.0.0-beta.1",
"@devexpress/dx-react-grid": "1.0.0-beta.1",
"react": "^15.6.1 || ^16.0.0",
"react": "^16.2.0",
"react-bootstrap": "^0.31.5"
}
}
8 changes: 4 additions & 4 deletions packages/dx-react-grid-material-ui/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,9 +77,9 @@
"material-ui": "1.0.0-beta.20",
"material-ui-icons": "1.0.0-beta.17",
"raf": "^3.4.0",
"react": "^16.1.1",
"react-dom": "^16.1.1",
"react-test-renderer": "^16.1.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-license": "^0.5.0",
Expand All @@ -95,6 +95,6 @@
"@devexpress/dx-react-grid": "1.0.0-beta.1",
"material-ui": "1.0.0-beta.20",
"material-ui-icons": "1.0.0-beta.17",
"react": "^15.6.1 || ^16.0.0"
"react": "^16.2.0"
}
}
10 changes: 5 additions & 5 deletions packages/dx-react-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,9 +70,9 @@
"eslint-plugin-react": "^7.4.0",
"jest": "^21.2.1",
"raf": "^3.4.0",
"react": "^16.1.1",
"react-dom": "^16.1.1",
"react-test-renderer": "^16.1.1",
"react": "^16.2.0",
"react-dom": "^16.2.0",
"react-test-renderer": "^16.2.0",
"rollup": "0.50.0",
"rollup-plugin-babel": "^3.0.2",
"rollup-plugin-license": "^0.5.0",
Expand All @@ -85,7 +85,7 @@
"peerDependencies": {
"@devexpress/dx-core": "1.0.0-beta.1",
"@devexpress/dx-react-core": "1.0.0-beta.1",
"react": "^15.6.1 || ^16.0.0",
"react-dom": "^15.6.1 || ^16.0.0"
"react": "^16.2.0",
"react-dom": "^16.2.0"
}
}
38 changes: 18 additions & 20 deletions packages/dx-react-grid/src/plugins/drag-drop-context.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,26 +43,24 @@ export class DragDropContext extends React.PureComponent {
pluginName="DragDropContext"
>
<Template name="root">
<div>
<DragDropContextCore
onChange={this.change}
>
<TemplatePlaceholder />
</DragDropContextCore>
{payload && (
<TemplateConnector>
{getters => (
<TemplateRenderer
template={containerTemplate}
params={getContainerTemplateArgs(
{ payload, clientOffset, columnTemplate },
getters,
)}
/>
)}
</TemplateConnector>
)}
</div>
<DragDropContextCore
onChange={this.change}
>
<TemplatePlaceholder />
</DragDropContextCore>
{payload && (
<TemplateConnector>
{getters => (
<TemplateRenderer
template={containerTemplate}
params={getContainerTemplateArgs(
{ payload, clientOffset, columnTemplate },
getters,
)}
/>
)}
</TemplateConnector>
)}
</Template>
</PluginContainer>
);
Expand Down
32 changes: 15 additions & 17 deletions packages/dx-react-grid/src/plugins/grouping-panel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,23 +50,21 @@ export class GroupingPanel extends React.PureComponent {
]}
>
<Template name="header">
<div>
<TemplateConnector>
{(getters, actions) => (
<TemplateRenderer
template={groupPanelTemplate}
params={getGroupPanelTemplateArgs(
{
allowDragging, allowSorting, allowUngroupingByClick, getMessage,
},
getters,
actions,
)}
/>
)}
</TemplateConnector>
<TemplatePlaceholder />
</div>
<TemplateConnector>
{(getters, actions) => (
<TemplateRenderer
template={groupPanelTemplate}
params={getGroupPanelTemplateArgs(
{
allowDragging, allowSorting, allowUngroupingByClick, getMessage,
},
getters,
actions,
)}
/>
)}
</TemplateConnector>
<TemplatePlaceholder />
</Template>
</PluginContainer>
);
Expand Down
20 changes: 9 additions & 11 deletions packages/dx-react-grid/src/plugins/paging-panel.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,15 @@ export class PagingPanel extends React.PureComponent {
dependencies={pluginDependencies}
>
<Template name="footer">
<div>
<TemplatePlaceholder />
<TemplateConnector>
{(getters, actions) => (
<TemplateRenderer
template={pagerTemplate}
params={getPagerTemplateArgs({ allowedPageSizes, getMessage }, getters, actions)}
/>
)}
</TemplateConnector>
</div>
<TemplatePlaceholder />
<TemplateConnector>
{(getters, actions) => (
<TemplateRenderer
template={pagerTemplate}
params={getPagerTemplateArgs({ allowedPageSizes, getMessage }, getters, actions)}
/>
)}
</TemplateConnector>
</Template>
</PluginContainer>
);
Expand Down
18 changes: 9 additions & 9 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6246,9 +6246,9 @@ react-bootstrap@^0.31.5:
uncontrollable "^4.1.0"
warning "^3.0.0"

react-dom@^16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.1.1.tgz#b2e331b6d752faf1a2d31399969399a41d8d45f8"
react-dom@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-dom/-/react-dom-16.2.0.tgz#69003178601c0ca19b709b33a83369fe6124c044"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down Expand Up @@ -6350,9 +6350,9 @@ react-scrollbar-size@^2.0.2:
prop-types "^15.5.10"
react-event-listener "^0.5.0"

react-test-renderer@^16.0.0-0, react-test-renderer@^16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.1.1.tgz#a05184688d564be799f212449262525d1e350537"
react-test-renderer@^16.0.0-0, react-test-renderer@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react-test-renderer/-/react-test-renderer-16.2.0.tgz#bddf259a6b8fcd8555f012afc8eacc238872a211"
dependencies:
fbjs "^0.8.16"
object-assign "^4.1.1"
Expand All @@ -6379,9 +6379,9 @@ react@^15.5.4:
object-assign "^4.1.0"
prop-types "^15.5.10"

react@^16.1.1:
version "16.1.1"
resolved "https://registry.yarnpkg.com/react/-/react-16.1.1.tgz#d5c4ef795507e3012282dd51261ff9c0e824fe1f"
react@^16.2.0:
version "16.2.0"
resolved "https://registry.yarnpkg.com/react/-/react-16.2.0.tgz#a31bd2dab89bff65d42134fa187f24d054c273ba"
dependencies:
fbjs "^0.8.16"
loose-envify "^1.1.0"
Expand Down