Skip to content

Commit eedf299

Browse files
irfanhuddajasonLaster
authored andcommitted
Convert ResultList and Accordion to es modules (firefox-devtools#2477)
1 parent d251352 commit eedf299

5 files changed

Lines changed: 18 additions & 22 deletions

File tree

src/components/Editor/SearchBar.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const { scrollList } = require("../../utils/result-list");
2727
const classnames = require("classnames");
2828
const debounce = require("lodash/debounce");
2929
const SearchInput = createFactory(require("../shared/SearchInput"));
30-
const ResultList = createFactory(require("../shared/ResultList"));
30+
const ResultList = createFactory(require("../shared/ResultList").default);
3131
const ImPropTypes = require("react-immutable-proptypes");
3232

3333
import type { FormattedSymbolDeclaration } from "../../utils/parser/utils";

src/components/SecondaryPanes/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const Scopes = isEnabled("chromeScopes")
2929

3030
const Frames = createFactory(require("./Frames").default);
3131
const EventListeners = createFactory(require("./EventListeners").default);
32-
const Accordion = createFactory(require("../shared/Accordion"));
32+
const Accordion = createFactory(require("../shared/Accordion").default);
3333
const CommandBar = createFactory(require("./CommandBar").default);
3434

3535
import "./SecondaryPanes.css";

src/components/shared/Accordion.js

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11
// @flow
2-
const React = require("react");
3-
const { DOM: dom, PropTypes } = React;
2+
import { DOM as dom, PropTypes, createClass, createElement } from "react";
3+
import Svg from "./Svg";
44

5-
const { div } = dom;
6-
const Svg = require("./Svg");
7-
8-
require("./Accordion.css");
5+
import "./Accordion.css";
96

107
type AccordionItem = {
118
buttons?: Array<Object>,
@@ -18,7 +15,7 @@ type AccordionItem = {
1815

1916
type Props = { items: Array<Object> };
2017

21-
const Accordion = React.createClass({
18+
const Accordion = createClass({
2219
propTypes: { items: PropTypes.array.isRequired },
2320
displayName: "Accordion",
2421
getInitialState() {
@@ -57,9 +54,9 @@ const Accordion = React.createClass({
5754
.toLowerCase()
5855
.replace(/\s/g, "-")}-pane`;
5956

60-
return div(
57+
return dom.div(
6158
{ className: containerClassName, key: i },
62-
div(
59+
dom.div(
6360
{ className: "_header", onClick: () => this.handleHeaderClick(i) },
6461
Svg("arrow", { className: opened[i] ? "expanded" : "" }),
6562
item.header,
@@ -68,22 +65,22 @@ const Accordion = React.createClass({
6865
: null
6966
),
7067
created[i] || opened[i]
71-
? div(
68+
? dom.div(
7269
{
7370
className: "_content",
7471
style: { display: opened[i] ? "block" : "none" },
7572
},
76-
React.createElement(item.component, item.componentProps || {})
73+
createElement(item.component, item.componentProps || {})
7774
)
7875
: null
7976
);
8077
},
8178
render() {
82-
return div(
79+
return dom.div(
8380
{ className: "accordion" },
8481
this.props.items.map(this.renderContainer)
8582
);
8683
},
8784
});
8885

89-
module.exports = Accordion;
86+
export default Accordion;

src/components/shared/Autocomplete.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const classnames = require("classnames");
77
const { scrollList } = require("../../utils/result-list");
88
const Svg = require("./Svg");
99
const SearchInput = createFactory(require("./SearchInput"));
10-
const ResultList = createFactory(require("./ResultList"));
10+
const ResultList = createFactory(require("./ResultList").default);
1111

1212
require("./Autocomplete.css");
1313

src/components/shared/ResultList.js

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
// @flow
2-
const React = require("react");
3-
const { DOM: dom, PropTypes } = React;
4-
const classnames = require("classnames");
2+
import { DOM as dom, PropTypes, createClass } from "react";
3+
import classnames from "classnames";
54

6-
require("./ResultList.css");
5+
import "./ResultList.css";
76

87
type ResultListItem = {
98
id: string,
@@ -12,7 +11,7 @@ type ResultListItem = {
1211
value: string,
1312
};
1413

15-
const ResultList = React.createClass({
14+
const ResultList = createClass({
1615
propTypes: {
1716
items: PropTypes.array.isRequired,
1817
selected: PropTypes.number.isRequired,
@@ -56,4 +55,4 @@ const ResultList = React.createClass({
5655
},
5756
});
5857

59-
module.exports = ResultList;
58+
export default ResultList;

0 commit comments

Comments
 (0)