Skip to content

Commit 6329a32

Browse files
committed
fix(blueprint): transform SCSS to JSS
- also removes unused schemas
1 parent cc897c5 commit 6329a32

File tree

13 files changed

+313
-2486
lines changed

13 files changed

+313
-2486
lines changed

packages/blueprint-component-mapper/demo/demo-schemas/miq-schema.js

Lines changed: 0 additions & 1949 deletions
This file was deleted.

packages/blueprint-component-mapper/demo/demo-schemas/widget-schema.js

Lines changed: 0 additions & 428 deletions
Large diffs are not rendered by default.

packages/blueprint-component-mapper/demo/index.js

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
/* eslint-disable */
22
import React from 'react';
33
import ReactDOM from 'react-dom';
4-
import FormRenderer from '@data-driven-forms/react-form-renderer';
5-
import miqSchema from './demo-schemas/miq-schema';
6-
import { uiArraySchema, arraySchema, array1Schema, schema, uiSchema, conditionalSchema, arraySchemaDDF } from './demo-schemas/widget-schema';
4+
import FormRenderer from '@data-driven-forms/react-form-renderer/form-renderer';
5+
import { arraySchemaDDF } from './demo-schemas/widget-schema';
76
import { componentMapper, FormTemplate } from '../src';
87
import { Button } from '@blueprintjs/core';
98
import {

packages/blueprint-component-mapper/package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@
6060
"dependencies": {
6161
"@data-driven-forms/common": "*",
6262
"clsx": "^1.1.0",
63-
"prop-types": "^15.7.2"
63+
"prop-types": "^15.7.2",
64+
"react-jss": "^10.5.0"
6465
}
6566
}

packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.js

Lines changed: 44 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,50 @@ import PropTypes from 'prop-types';
44
import DualListSelectCommon from '@data-driven-forms/common/dual-list-select';
55
import { Menu, MenuItem, ButtonGroup, Button, ControlGroup, InputGroup } from '@blueprintjs/core';
66
import clsx from 'clsx';
7+
import { createUseStyles } from 'react-jss';
78

89
import { FormGroupInternal } from '../form-group/form-group';
910

10-
import './dual-list-select.scss';
11+
const useStyles = createUseStyles({
12+
menu: {
13+
height: '80%',
14+
overflow: 'auto'
15+
},
16+
buttonGroup: {
17+
justifyContent: 'center'
18+
},
19+
wrapper: {
20+
display: 'flex',
21+
justifyContent: 'space-evenly',
22+
minHeight: 250
23+
},
24+
'@media (max-width: 768px)': {
25+
wrapper: {
26+
flexDirection: 'column'
27+
}
28+
}
29+
});
1130

12-
const List = ({ value, optionClick, noOptionsTitle, filterValue, filterValueText, selectedValues, MenuProps, MenuItemProps }) => (
13-
<Menu {...MenuProps} className={clsx('bp3-elevation-1', 'ddorg__blueprint_mapper--dls-menu', MenuProps.className)}>
14-
{value.length < 1 && <MenuItem text={filterValue ? filterValueText : noOptionsTitle} disabled {...MenuItemProps} />}
15-
{value.length > 0 &&
16-
value.map(({ value, label, MenuItemProps: ItemMenuItemProps }) => (
17-
<MenuItem
18-
onClick={(e) => optionClick(e, value)}
19-
key={value}
20-
active={selectedValues.includes(value)}
21-
text={label}
22-
{...MenuItemProps}
23-
{...ItemMenuItemProps}
24-
/>
25-
))}
26-
</Menu>
27-
);
31+
const List = ({ value, optionClick, noOptionsTitle, filterValue, filterValueText, selectedValues, MenuProps, MenuItemProps }) => {
32+
const { menu } = useStyles();
33+
34+
return (
35+
<Menu {...MenuProps} className={clsx('bp3-elevation-1', menu, MenuProps.className)}>
36+
{value.length < 1 && <MenuItem text={filterValue ? filterValueText : noOptionsTitle} disabled {...MenuItemProps} />}
37+
{value.length > 0 &&
38+
value.map(({ value, label, MenuItemProps: ItemMenuItemProps }) => (
39+
<MenuItem
40+
onClick={(e) => optionClick(e, value)}
41+
key={value}
42+
active={selectedValues.includes(value)}
43+
text={label}
44+
{...MenuItemProps}
45+
{...ItemMenuItemProps}
46+
/>
47+
))}
48+
</Menu>
49+
);
50+
};
2851

2952
List.propTypes = {
3053
value: PropTypes.arrayOf(
@@ -121,8 +144,10 @@ const DualListInternal = ({
121144
RightMenuProps,
122145
RightMenuItemProps
123146
}) => {
147+
const { buttonGroup, wrapper } = useStyles();
148+
124149
return (
125-
<div {...WrapperProps} className={clsx('ddorg__blueprint_mapper--dls-wrapper', WrapperProps.className)}>
150+
<div {...WrapperProps} className={clsx(wrapper, WrapperProps.className)}>
126151
<div {...LeftWrapperProps}>
127152
{leftTitle}
128153
<Toolbar
@@ -146,12 +171,7 @@ const DualListInternal = ({
146171
MenuItemProps={LeftMenuItemProps}
147172
/>
148173
</div>
149-
<ButtonGroup
150-
vertical
151-
alignText="center"
152-
{...ButtonGroupProps}
153-
className={clsx('ddorg__blueprint_mapper--dls-button-group', ButtonGroupProps.className)}
154-
>
174+
<ButtonGroup vertical alignText="center" {...ButtonGroupProps} className={clsx(buttonGroup, ButtonGroupProps.className)}>
155175
<Button
156176
disabled={state.selectedLeftValues.length === 0}
157177
onClick={handleMoveRight}

packages/blueprint-component-mapper/src/dual-list-select/dual-list-select.scss

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/blueprint-component-mapper/src/field-array/field-array.js

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,26 @@ import React, { useContext } from 'react';
22
import PropTypes from 'prop-types';
33
import clsx from 'clsx';
44
import { useFieldApi, useFormApi, FieldArray as FieldArrayFF } from '@data-driven-forms/react-form-renderer';
5+
import { createUseStyles } from 'react-jss';
56

67
import { Button, Intent, FormGroup } from '@blueprintjs/core';
78

89
import BlueprintContext from '../blueprint-context/blueprint-context';
910

10-
import './field-array.scss';
11+
const useStyles = createUseStyles({
12+
addContainer: {
13+
display: 'flex',
14+
flexFlow: 'row-reverse',
15+
marginBottom: 15
16+
},
17+
remove: {
18+
marginBottom: 15
19+
}
20+
});
1121

1222
const ArrayItem = ({ remove, fields, name, removeLabel, ArrayItemProps, RemoveButtonProps, disabledRemove }) => {
1323
const formOptions = useFormApi();
24+
const { remove: removeCss } = useStyles();
1425

1526
const editedFields = fields.map((field) => ({
1627
...field,
@@ -25,7 +36,7 @@ const ArrayItem = ({ remove, fields, name, removeLabel, ArrayItemProps, RemoveBu
2536
intent={Intent.DANGER}
2637
disabled={disabledRemove}
2738
{...RemoveButtonProps}
28-
className={clsx('ddorg__blueprint_mapper--field-array-remove', RemoveButtonProps && RemoveButtonProps.className)}
39+
className={clsx(removeCss, RemoveButtonProps && RemoveButtonProps.className)}
2940
>
3041
{removeLabel}
3142
</Button>
@@ -68,6 +79,8 @@ const FieldArray = (props) => {
6879

6980
const { required } = useContext(BlueprintContext);
7081

82+
const { addContainer } = useStyles();
83+
7184
const { error, touched, submitError } = meta;
7285
const showError = (validateOnMount || touched) && (error || submitError);
7386

@@ -100,10 +113,7 @@ const FieldArray = (props) => {
100113
disabledRemove={fieldArrayProps.fields.length <= minItems}
101114
/>
102115
))}
103-
<div
104-
{...AddContainerProps}
105-
className={clsx('ddorg__blueprint_mapper--field-array-add-container', AddContainerProps && AddContainerProps.className)}
106-
>
116+
<div {...AddContainerProps} className={clsx(addContainer, AddContainerProps && AddContainerProps.className)}>
107117
<Button
108118
onClick={() => fieldArrayProps.fields.push(defaultItem)}
109119
intent={Intent.SUCCESS}

packages/blueprint-component-mapper/src/field-array/field-array.scss

Lines changed: 0 additions & 9 deletions
This file was deleted.

packages/blueprint-component-mapper/src/form-template/form-template.js

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import React from 'react';
22
import PropTypes from 'prop-types';
3+
import { createUseStyles } from 'react-jss';
34

45
import FormTemplate from '@data-driven-forms/common/form-template';
56
import { Button, H1, H2 } from '@blueprintjs/core';
67
import BlueprintContext from '../blueprint-context/blueprint-context';
78

8-
import './form-template.scss';
9-
109
const Form = ({ children, ...props }) => (
1110
<form noValidate {...props} style={{ display: 'grid' }}>
1211
{children}
@@ -17,11 +16,25 @@ Form.propTypes = {
1716
children: PropTypes.node
1817
};
1918

20-
const ButtonGroup = ({ children, ...props }) => (
21-
<div className="ddorg__blueprint_mapper--button-group" {...props}>
22-
{children}
23-
</div>
24-
);
19+
const useStyles = createUseStyles({
20+
buttonGroup: {
21+
marginTop: 16,
22+
23+
'& button:not(:first-child)': {
24+
marginLeft: 8
25+
}
26+
}
27+
});
28+
29+
const ButtonGroup = ({ children, ...props }) => {
30+
const { buttonGroup } = useStyles();
31+
32+
return (
33+
<div className={buttonGroup} {...props}>
34+
{children}
35+
</div>
36+
);
37+
};
2538

2639
ButtonGroup.propTypes = {
2740
children: PropTypes.node

packages/blueprint-component-mapper/src/form-template/form-template.scss

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)