Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit 3749490

Browse files
committed
Remove factories because deprecated, and bump modules
1 parent b5ee79a commit 3749490

8 files changed

+40
-57
lines changed

demos/index.tsx

+31-31
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,7 @@ setOptions({
2222
});
2323

2424
storiesOf("Elements/Field", module)
25-
.addDecorator(story => (
26-
<div className="pure-form">
27-
{story()}
28-
</div>
29-
))
25+
.addDecorator(story => <div className="pure-form">{story()}</div>)
3026
.addDecorator(
3127
host({
3228
align: "center middle"
@@ -48,22 +44,21 @@ storiesOf("Elements/Field", module)
4844
return <FieldElementWidget livetype={true} valueChangedEvent={action("event")} />;
4945
})
5046
.add("As TextArea", () => {
51-
return (
52-
<FieldElementWidget textArea={true} value="Test value" />
53-
)
47+
return <FieldElementWidget textArea={true} value="Test value" />;
5448
})
5549
.add("As TextArea area with live type", () => {
5650
return (
57-
<FieldElementWidget textArea={true} livetype={true} valueChangedEvent={action("event")} value="Test value" />
58-
)
51+
<FieldElementWidget
52+
textArea={true}
53+
livetype={true}
54+
valueChangedEvent={action("event")}
55+
value="Test value"
56+
/>
57+
);
5958
});
6059

6160
storiesOf("Elements/Checkbox", module)
62-
.addDecorator(story => (
63-
<div className="pure-form">
64-
{story()}
65-
</div>
66-
))
61+
.addDecorator(story => <div className="pure-form">{story()}</div>)
6762
.addDecorator(
6863
host({
6964
align: "center middle"
@@ -80,39 +75,40 @@ storiesOf("Elements/Checkbox", module)
8075
});
8176

8277
storiesOf("Elements/Select", module)
83-
.addDecorator(story => (
84-
<div className="pure-form">
85-
{story()}
86-
</div>
87-
))
78+
.addDecorator(story => <div className="pure-form">{story()}</div>)
8879
.addDecorator(
8980
host({
90-
align: "center middle",
81+
align: "center middle"
9182
})
9283
)
9384
.add("Set", () => {
94-
return <SelectElementWidget groups={['Apple', 'Peach', 'Lemon']}/>;
85+
return <SelectElementWidget groups={["Apple", "Peach", "Lemon"]} />;
9586
})
9687
.add("Set with value", () => {
97-
return <SelectElementWidget groups={['Apple', 'Peach', 'Lemon']} value="Peach" />;
88+
return <SelectElementWidget groups={["Apple", "Peach", "Lemon"]} value="Peach" />;
9889
})
9990
.add("Set in groups", () => {
100-
return <SelectElementWidget groups={{"Group 1": ['Apple', 'Peach'], "Group 2": ['Lemon']}} />;
91+
return <SelectElementWidget groups={{ "Group 1": ["Apple", "Peach"], "Group 2": ["Lemon"] }} />;
10192
})
10293
.add("Set in groups with value", () => {
103-
return <SelectElementWidget groups={{"Group 1": ['Apple', 'Peach'], "Group 2": ['Lemon']}} value="Lemon" />;
94+
return <SelectElementWidget groups={{ "Group 1": ["Apple", "Peach"], "Group 2": ["Lemon"] }} value="Lemon" />;
10495
})
10596
.add("Map", () => {
106-
return <SelectElementWidget groups={{'a' : 'Apple', 'b' : 'Peach', 'c': 'Lemon'}} />;
97+
return <SelectElementWidget groups={{ a: "Apple", b: "Peach", c: "Lemon" }} />;
10798
})
10899
.add("Map with value", () => {
109-
return <SelectElementWidget groups={{'a' : 'Apple', 'b' : 'Peach', 'c': 'Lemon'}} value="c" />;
100+
return <SelectElementWidget groups={{ a: "Apple", b: "Peach", c: "Lemon" }} value="c" />;
110101
})
111102
.add("Map in groups", () => {
112-
return <SelectElementWidget groups={{"Group 1": {'a' : 'Apple', 'b' : 'Peach'}, "Group 2": {'c': 'Lemon'}}} />;
103+
return <SelectElementWidget groups={{ "Group 1": { a: "Apple", b: "Peach" }, "Group 2": { c: "Lemon" } }} />;
113104
})
114105
.add("Map in groups with value", () => {
115-
return <SelectElementWidget groups={{"Group 1": {'a' : 'Apple', 'b' : 'Peach'}, "Group 2": {'c': 'Lemon'}}} value="c" />;
106+
return (
107+
<SelectElementWidget
108+
groups={{ "Group 1": { a: "Apple", b: "Peach" }, "Group 2": { c: "Lemon" } }}
109+
value="c"
110+
/>
111+
);
116112
});
117113

118114
storiesOf("Forms", module)
@@ -167,12 +163,16 @@ storiesOf("Forms", module)
167163
storiesOf("Forms/Binded", module)
168164
.addDecorator(
169165
host({
170-
align: "center middle",
166+
align: "center middle"
171167
})
172168
)
173169
.add("Binded Form", () => {
174170
return (
175-
<FormWidget className="pure-form" value={{ Name: "Dylan", Surname: "Vorster" }} formSubmitEvent={action("formSubmitEvent")}>
171+
<FormWidget
172+
className="pure-form"
173+
value={{ Name: "Dylan", Surname: "Vorster" }}
174+
formSubmitEvent={action("formSubmitEvent")}
175+
>
176176
<TableLayoutWidget>
177177
<FieldElementWidget name="Name" />
178178
<FieldElementWidget name="Surname" />

src/core/ButtonElementWidget.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,3 @@ export class ButtonElementWidget extends BaseWidget<ButtonElementWidgetProps, Bu
1818
return <input {...this.getProps()} type="button" value={this.props.name} onClick={this.props.action} />;
1919
}
2020
}
21-
22-
export var ButtonElementWidgetFactory = React.createFactory(ButtonElementWidget);

src/core/FormGroupWidget.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -71,5 +71,3 @@ export class FormGroupWidget extends BaseElementWidget<any, FormGroupWidgetProps
7171
return <div {...this.getProps()}>{this.bindChildren(this.props.children)}</div>;
7272
}
7373
}
74-
75-
export var FormGroupWidgetFactory = React.createFactory(FormGroupWidget);

src/core/FormWidget.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -111,5 +111,3 @@ export class FormWidget extends BaseWidget<FormWidgetProps, FormWidgetState> {
111111
);
112112
}
113113
}
114-
115-
export var FormWidgetFactory = React.createFactory(FormWidget);

src/layout/TableLayoutWidget.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,3 @@ export class TableLayoutWidget extends BaseWidget<TableLayoutWidgetProps, TableL
4040
);
4141
}
4242
}
43-
44-
export var TableLayoutWidgetFactory = React.createFactory(TableLayoutWidget);

src/types/CheckboxElementWidget.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,3 @@ export class CheckboxElementWidget extends BaseElementWidget<
3535
);
3636
}
3737
}
38-
39-
export var CheckboxElementWidgetFactory = React.createFactory(CheckboxElementWidget);

src/types/FieldElementWidget.tsx

+4-9
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ export class FieldElementWidget extends BaseElementWidget<string, FieldElementWi
3838
onChange: event => {
3939
this.setValue(event.target.value, this.props.livetype);
4040
},
41-
onKeyPress: (event) => {
42-
if (event.key === 'Enter') {
43-
41+
onKeyPress: event => {
42+
if (event.key === "Enter") {
4443
//livetype
4544
if (this.props.livetype === false && this.props.valueChangedEvent) {
4645
event.preventDefault();
@@ -64,14 +63,10 @@ export class FieldElementWidget extends BaseElementWidget<string, FieldElementWi
6463
props["autoComplete"] = "new-password";
6564
}
6665

67-
if(this.props.textArea){
66+
if (this.props.textArea) {
6867
return <textarea {...props} />;
6968
}
7069

71-
return (
72-
<input {...props} />
73-
);
70+
return <input {...props} />;
7471
}
7572
}
76-
77-
export var FieldElementWidgetFactory = React.createFactory(FieldElementWidget);

src/types/SelectElementWidget.tsx

+5-7
Original file line numberDiff line numberDiff line change
@@ -62,18 +62,18 @@ export class SelectElementWidget extends BaseElementWidget<string, SelectElement
6262
this.setState(this.computeNewComponentState(nextProps));
6363
}
6464

65-
normlaizeGroup(option){
66-
if(_.isArray(option)){
67-
return _.mapKeys(option, (opt) => {
65+
normlaizeGroup(option) {
66+
if (_.isArray(option)) {
67+
return _.mapKeys(option, opt => {
6868
return opt;
69-
})
69+
});
7070
}
7171
return option;
7272
}
7373

7474
getOptions(groupData: any): { [groupName: string]: { [value: string]: string } } {
7575
// its just a normal set
76-
if(_.isArray(groupData)){
76+
if (_.isArray(groupData)) {
7777
return {
7878
[this.props.defaultGroup]: this.normlaizeGroup(groupData)
7979
};
@@ -127,5 +127,3 @@ export class SelectElementWidget extends BaseElementWidget<string, SelectElement
127127
);
128128
}
129129
}
130-
131-
export var SelectElementWidgetFactory = React.createFactory(SelectElementWidget);

0 commit comments

Comments
 (0)