Skip to content

Commit e1980a7

Browse files
bedrich-schindlerbedrich-schindler
committed
Change UI component exports to fix withForwardedRef (#229)
1 parent 9aeaa28 commit e1980a7

File tree

11 files changed

+62
-59
lines changed

11 files changed

+62
-59
lines changed

‎src/lib/components/layout/FormLayout/__tests__/__snapshots__/FormLayout.test.jsx.snap‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ exports[`rendering renders correctly with a single child 1`] = `
44
<div
55
className="root rootFieldLayoutVertical "
66
>
7-
<WithProviderContextComponent
7+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
88
id="test-id"
99
inFormLayout={true}
1010
key=".0"
@@ -19,7 +19,7 @@ exports[`rendering renders correctly with auto label width 1`] = `
1919
className="root rootFieldLayoutHorizontal hasRootLabelWidthAuto"
2020
id="test-id"
2121
>
22-
<WithProviderContextComponent
22+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
2323
id="test-id"
2424
inFormLayout={true}
2525
key=".0"
@@ -39,7 +39,7 @@ exports[`rendering renders correctly with custom label width 1`] = `
3939
}
4040
}
4141
>
42-
<WithProviderContextComponent
42+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
4343
id="test-id"
4444
inFormLayout={true}
4545
key=".0"
@@ -53,21 +53,21 @@ exports[`rendering renders correctly with multiple children 1`] = `
5353
<div
5454
className="root rootFieldLayoutVertical "
5555
>
56-
<WithProviderContextComponent
56+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
5757
id="test-id-1"
5858
inFormLayout={true}
5959
key=".0"
6060
label="Text field 1"
6161
layout="vertical"
6262
/>
63-
<WithProviderContextComponent
63+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
6464
id="test-id-2"
6565
inFormLayout={true}
6666
key=".1"
6767
label="Text field 2"
6868
layout="vertical"
6969
/>
70-
<WithProviderContextComponent
70+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
7171
id="test-id-3"
7272
inFormLayout={true}
7373
key=".2"

‎src/lib/components/ui/Button/Button.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,6 +237,6 @@ Button.propTypes = {
237237
variant: PropTypes.oneOf(['primary', 'secondary', 'success', 'warning', 'danger', 'dark']),
238238
};
239239

240-
export const ButtonWithContext = withProviderContext(withForwardedRef(Button), 'Button');
240+
export const ButtonWithContext = withForwardedRef(withProviderContext(Button, 'Button'));
241241

242242
export default ButtonWithContext;

‎src/lib/components/ui/ButtonGroup/__tests__/__snapshots__/ButtonGroup.test.jsx.snap‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ exports[`rendering renders correctly mandatory props only 1`] = `
55
className="root "
66
role="group"
77
>
8-
<WithProviderContextComponent
8+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
99
block={false}
1010
disabled={false}
1111
grouped={true}
@@ -14,7 +14,7 @@ exports[`rendering renders correctly mandatory props only 1`] = `
1414
priority="filled"
1515
size="medium"
1616
/>
17-
<WithProviderContextComponent
17+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
1818
block={false}
1919
disabled={false}
2020
grouped={true}
@@ -31,7 +31,7 @@ exports[`rendering renders correctly priority 1`] = `
3131
className="root "
3232
role="group"
3333
>
34-
<WithProviderContextComponent
34+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
3535
block={false}
3636
disabled={false}
3737
grouped={true}
@@ -40,7 +40,7 @@ exports[`rendering renders correctly priority 1`] = `
4040
priority="outline"
4141
size="medium"
4242
/>
43-
<WithProviderContextComponent
43+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
4444
block={false}
4545
disabled={false}
4646
grouped={true}
@@ -57,7 +57,7 @@ exports[`rendering renders correctly size 1`] = `
5757
className="root "
5858
role="group"
5959
>
60-
<WithProviderContextComponent
60+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
6161
block={false}
6262
disabled={false}
6363
grouped={true}
@@ -66,7 +66,7 @@ exports[`rendering renders correctly size 1`] = `
6666
priority="filled"
6767
size="large"
6868
/>
69-
<WithProviderContextComponent
69+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
7070
block={false}
7171
disabled={false}
7272
grouped={true}
@@ -83,7 +83,7 @@ exports[`rendering renders correctly with all props 1`] = `
8383
className="root isRootBlock"
8484
role="group"
8585
>
86-
<WithProviderContextComponent
86+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
8787
block={true}
8888
disabled={true}
8989
grouped={true}
@@ -92,7 +92,7 @@ exports[`rendering renders correctly with all props 1`] = `
9292
priority="outline"
9393
size="small"
9494
/>
95-
<WithProviderContextComponent
95+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
9696
block={true}
9797
disabled={true}
9898
grouped={true}

‎src/lib/components/ui/CheckboxField/CheckboxField.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,6 @@ CheckboxField.propTypes = {
171171
]),
172172
};
173173

174-
export const CheckboxFieldWithContext = withProviderContext(withForwardedRef(CheckboxField), 'CheckboxField');
174+
export const CheckboxFieldWithContext = withForwardedRef(withProviderContext(CheckboxField, 'CheckboxField'));
175175

176176
export default CheckboxFieldWithContext;

‎src/lib/components/ui/Modal/__tests__/__snapshots__/Modal.test.jsx.snap‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ exports[`rendering renders correctly with all props except loading icon 1`] = `
223223
<div
224224
className="item"
225225
>
226-
<WithProviderContextComponent
226+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
227227
clickHandler={[Function]}
228228
forwardedRef={
229229
Object {
@@ -238,13 +238,9 @@ exports[`rendering renders correctly with all props except loading icon 1`] = `
238238
}
239239
type="button"
240240
>
241-
<ForwardRef(withForwardedRef(Button))
241+
<WithProviderContextComponent
242242
clickHandler={[Function]}
243-
forwardedRef={
244-
Object {
245-
"current": null,
246-
}
247-
}
243+
forwardedRef={null}
248244
label="Action"
249245
loadingIcon={
250246
<span
@@ -302,8 +298,8 @@ exports[`rendering renders correctly with all props except loading icon 1`] = `
302298
</span>
303299
</button>
304300
</Button>
305-
</ForwardRef(withForwardedRef(Button))>
306-
</WithProviderContextComponent>
301+
</WithProviderContextComponent>
302+
</ForwardRef(withForwardedRef(WithProviderContextComponent))>
307303
</div>
308304
</ToolbarItem>
309305
</WithProviderContextComponent>
@@ -312,14 +308,15 @@ exports[`rendering renders correctly with all props except loading icon 1`] = `
312308
<div
313309
className="item"
314310
>
315-
<WithProviderContextComponent
311+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
316312
clickHandler={[Function]}
317313
id="custom-id__closeModalFooterButton"
318314
label="Close"
319315
priority="flat"
320316
>
321-
<ForwardRef(withForwardedRef(Button))
317+
<WithProviderContextComponent
322318
clickHandler={[Function]}
319+
forwardedRef={null}
323320
id="custom-id__closeModalFooterButton"
324321
label="Close"
325322
priority="flat"
@@ -361,8 +358,8 @@ exports[`rendering renders correctly with all props except loading icon 1`] = `
361358
</span>
362359
</button>
363360
</Button>
364-
</ForwardRef(withForwardedRef(Button))>
365-
</WithProviderContextComponent>
361+
</WithProviderContextComponent>
362+
</ForwardRef(withForwardedRef(WithProviderContextComponent))>
366363
</div>
367364
</ToolbarItem>
368365
</WithProviderContextComponent>
@@ -893,13 +890,14 @@ exports[`rendering renders correctly with translations 1`] = `
893890
<div
894891
className="item"
895892
>
896-
<WithProviderContextComponent
893+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
897894
clickHandler={[Function]}
898895
label="Zavřít"
899896
priority="flat"
900897
>
901-
<ForwardRef(withForwardedRef(Button))
898+
<WithProviderContextComponent
902899
clickHandler={[Function]}
900+
forwardedRef={null}
903901
label="Zavřít"
904902
priority="flat"
905903
>
@@ -937,8 +935,8 @@ exports[`rendering renders correctly with translations 1`] = `
937935
</span>
938936
</button>
939937
</Button>
940-
</ForwardRef(withForwardedRef(Button))>
941-
</WithProviderContextComponent>
938+
</WithProviderContextComponent>
939+
</ForwardRef(withForwardedRef(WithProviderContextComponent))>
942940
</div>
943941
</ToolbarItem>
944942
</WithProviderContextComponent>

‎src/lib/components/ui/SelectField/SelectField.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,6 +208,6 @@ SelectField.propTypes = {
208208
variant: PropTypes.oneOf(['filled', 'outline']),
209209
};
210210

211-
export const SelectFieldWithContext = withProviderContext(withForwardedRef(SelectField), 'SelectField');
211+
export const SelectFieldWithContext = withForwardedRef(withProviderContext(SelectField, 'SelectField'));
212212

213213
export default SelectFieldWithContext;

‎src/lib/components/ui/Table/__tests__/__snapshots__/Table.test.jsx.snap‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ exports[`rendering renders correctly with all props 1`] = `
7373
<div
7474
className="sortButton"
7575
>
76-
<WithProviderContextComponent
76+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
7777
beforeLabel={
7878
<span
7979
className="icon"
@@ -96,7 +96,7 @@ exports[`rendering renders correctly with all props 1`] = `
9696
<div
9797
className="sortButton"
9898
>
99-
<WithProviderContextComponent
99+
<ForwardRef(withForwardedRef(WithProviderContextComponent))
100100
beforeLabel={
101101
<span
102102
className="icon"

‎src/lib/components/ui/TextArea/TextArea.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,6 @@ TextArea.propTypes = {
197197
variant: PropTypes.oneOf(['filled', 'outline']),
198198
};
199199

200-
export const TextAreaWithContext = withProviderContext(withForwardedRef(TextArea), 'TextArea');
200+
export const TextAreaWithContext = withForwardedRef(withProviderContext(TextArea, 'TextArea'));
201201

202202
export default TextAreaWithContext;

‎src/lib/components/ui/TextField/TextField.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -217,6 +217,6 @@ TextField.propTypes = {
217217
variant: PropTypes.oneOf(['filled', 'outline']),
218218
};
219219

220-
export const TextFieldWithContext = withProviderContext(withForwardedRef(TextField), 'TextField');
220+
export const TextFieldWithContext = withForwardedRef(withProviderContext(TextField, 'TextField'));
221221

222222
export default TextFieldWithContext;

‎src/lib/components/ui/Toggle/Toggle.jsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,6 +171,6 @@ Toggle.propTypes = {
171171
]),
172172
};
173173

174-
export const ToggleWithContext = withProviderContext(withForwardedRef(Toggle), 'Toggle');
174+
export const ToggleWithContext = withForwardedRef(withProviderContext(Toggle, 'Toggle'));
175175

176176
export default ToggleWithContext;

0 commit comments

Comments
 (0)