Skip to content

Commit

Permalink
Add allowing additional inputProps (#1430)
Browse files Browse the repository at this point in the history
* Add merging of inputProps and external input props in MuiInputText
* Add test for MaterialTextControl
  • Loading branch information
Lily authored and edgarmueller committed Jul 8, 2019
1 parent 97c08a6 commit f6f99ca
Show file tree
Hide file tree
Showing 2 changed files with 104 additions and 2 deletions.
12 changes: 10 additions & 2 deletions packages/material/src/mui-controls/MuiInputText.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,12 @@ interface MuiInputTextStatus {
showAdornment: boolean;
}

interface MuiTextInputProps {
muiInputProps? : React.HTMLAttributes<HTMLInputElement>
}

export class MuiInputText extends React.Component<
CellProps & WithClassname,
CellProps & WithClassname & MuiTextInputProps,
MuiInputTextStatus
> {
state: MuiInputTextStatus = { showAdornment: false };
Expand All @@ -51,7 +55,8 @@ export class MuiInputText extends React.Component<
isValid,
path,
handleChange,
schema
schema,
muiInputProps
} = this.props;
const maxLength = schema.maxLength;
const mergedConfig = merge({}, config, uischema.options);
Expand All @@ -61,6 +66,9 @@ export class MuiInputText extends React.Component<
} else {
inputProps = {};
}

inputProps = merge(inputProps, muiInputProps);

if (mergedConfig.trim && maxLength !== undefined) {
inputProps.size = maxLength;
}
Expand Down
94 changes: 94 additions & 0 deletions packages/material/test/renderers/MaterialTextControl.test.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
/*
The MIT License
Copyright (c) 2018-2019 EclipseSource Munich
https://github.com/eclipsesource/jsonforms
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
*/
import React from 'react';
import Enzyme, { mount, ReactWrapper } from 'enzyme';
import { MaterialTextControl } from '../../src/controls/MaterialTextControl';
import { MaterialInputControl } from '../../src/controls/MaterialInputControl';
import { MuiInputText } from '../../src/mui-controls/MuiInputText';
import Adapter from 'enzyme-adapter-react-16';
import { ControlElement, ControlProps } from '@jsonforms/core';

Enzyme.configure({ adapter: new Adapter() });

const schema = {
type: 'object',
properties: {
foo: {
type: 'string'
}
}
};
const uischema: ControlElement = {
type: 'Control',
scope: '#/properties/foo'
};

const createMaterialTextControl = (props: ControlProps) => {
return <MaterialTextControl {...props} />;
};

const defaultControlProps = (): ControlProps => {
return {
handleChange: () => {},
enabled: true,
visible: true,
path: 'path',
rootSchema: schema,
schema: schema.properties.foo,
uischema: uischema,
label: 'Foo',
id: 'foo-id',
errors: '',
data: ''
};
};

describe('Material text control', () => {
let wrapper: ReactWrapper;

afterEach(() => {
wrapper.unmount();
});

it('render', () => {
const props = defaultControlProps();
wrapper = mount(createMaterialTextControl(props));
expect(wrapper.find(MaterialInputControl).props()).toEqual({
...props,
input: MuiInputText
});

expect(wrapper.find("input").props().id).toEqual(`${props.id}-input`);
});

it('allows adding of mui input props', () => {
const props = {
...defaultControlProps(),
muiInputProps: { spellCheck: false }
};
wrapper = mount(createMaterialTextControl(props));
expect(wrapper.find('input').props().spellCheck).toEqual(false)
});
});

0 comments on commit f6f99ca

Please sign in to comment.