Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(FluidTextArea): adds new fluid text area #12053

Merged
merged 17 commits into from
Sep 27, 2022
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
79 changes: 79 additions & 0 deletions packages/react/__tests__/__snapshots__/PublicAPI-test.js.snap
Original file line number Diff line number Diff line change
Expand Up @@ -9176,6 +9176,85 @@ Map {
},
},
},
"unstable__FluidTextArea" => Object {
"propTypes": Object {
"className": Object {
"type": "string",
},
"cols": Object {
"type": "number",
},
"defaultValue": Object {
"args": Array [
Array [
Object {
"type": "string",
},
Object {
"type": "number",
},
],
],
"type": "oneOfType",
},
"disabled": Object {
"type": "bool",
},
"enableCounter": Object {
"type": "bool",
},
"helperText": Object {
"type": "node",
},
"hideLabel": Object {
"type": "bool",
},
"id": Object {
"type": "string",
},
"invalid": Object {
"type": "bool",
},
"invalidText": Object {
"type": "node",
},
"labelText": Object {
"isRequired": true,
"type": "node",
},
"light": Object {
"type": "bool",
},
"maxCount": Object {
"type": "number",
},
"onChange": Object {
"type": "func",
},
"onClick": Object {
"type": "func",
},
"placeholder": Object {
"type": "string",
},
"rows": Object {
"type": "number",
},
"value": Object {
"args": Array [
Array [
Object {
"type": "string",
},
Object {
"type": "number",
},
],
],
"type": "oneOfType",
},
},
},
"unstable__FluidTextInput" => Object {
"propTypes": Object {
"className": Object {
Expand Down
1 change: 1 addition & 0 deletions packages/react/src/__tests__/index-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -229,6 +229,7 @@ describe('Carbon Components React', () => {
"unstable_Pagination",
"unstable_Text",
"unstable_TextDirection",
"unstable__FluidTextArea",
"unstable__FluidTextInput",
"unstable_useContextMenu",
"unstable_useFeatureFlag",
Expand Down
56 changes: 0 additions & 56 deletions packages/react/src/components/FluidForm/FluidForm-story.js

This file was deleted.

84 changes: 84 additions & 0 deletions packages/react/src/components/FluidForm/FluidForm.stories.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import React from 'react';
import { action } from '@storybook/addon-actions';

import { withKnobs } from '@storybook/addon-knobs';
import FluidForm from '.';
import FluidTextInput from '../FluidTextInput';
import FluidTextArea from '../FluidTextArea';
import ModalWrapper from '../ModalWrapper';

const additionalProps = {
className: 'some-class',
onSubmit: (e) => {
e.preventDefault();
action('FormSubmitted')(e);
},
};

const TextInputProps = {
className: 'some-class',
id: 'test2',
labelText: 'Text Input label',
placeholder: 'Placeholder text',
};

const TextAreaProps = {
className: 'some-class',
id: 'test3',
labelText: 'Text Area label',
placeholder: 'Placeholder text',
};

const InvalidPasswordProps = {
className: 'some-class',
id: 'test4',
labelText: 'Password',
value: '0000',
};

export default {
title: 'Experimental/FluidForm',
component: FluidForm,
decorators: [withKnobs],
};

export const Default = () => (
<>
<FluidForm {...additionalProps}>
<FluidTextInput {...TextInputProps} />
<FluidTextInput
type="password"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,}"
{...InvalidPasswordProps}
/>
<FluidTextArea {...TextAreaProps} />
</FluidForm>

<br />

<ModalWrapper
hasScrollingContent
buttonTriggerText="Fluid form in modal"
modalHeading="Modal heading"
modalLabel="Label"
handleSubmit={() => {}}
size="md">
<FluidForm {...additionalProps}>
<FluidTextInput {...TextInputProps} />
<FluidTextInput
type="password"
pattern="(?=.*\d)(?=.*[a-z])(?=.*[A-Z]).{6,}"
{...InvalidPasswordProps}
/>
<FluidTextArea {...TextAreaProps} />
</FluidForm>
</ModalWrapper>
</>
);
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import PropTypes from 'prop-types';
import React from 'react';
import classnames from 'classnames';
import { usePrefix } from '../../internal/usePrefix';
import { FormContext } from '../FluidForm/FormContext';

function FluidTextAreaSkeleton({ className, ...other }) {
const prefix = usePrefix();

return (
<FormContext.Provider value={{ isFluid: true }}>
<div
className={classnames(
`${prefix}--form-item ${prefix}--text-area--fluid__skeleton`,
className
)}
{...other}>
<span className={`${prefix}--label ${prefix}--skeleton`} />
<div className={`${prefix}--skeleton ${prefix}--text-area`} />
</div>
</FormContext.Provider>
);
}

FluidTextAreaSkeleton.propTypes = {
/**
* Specify an optional className to be applied to the outer FluidForm wrapper
*/
className: PropTypes.string,
};

export default FluidTextAreaSkeleton;
123 changes: 123 additions & 0 deletions packages/react/src/components/FluidTextArea/FluidTextArea.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,123 @@
/**
* Copyright IBM Corp. 2016, 2018
*
* This source code is licensed under the Apache-2.0 license found in the
* LICENSE file in the root directory of this source tree.
*/

import PropTypes from 'prop-types';
import React from 'react';
import classnames from 'classnames';
import TextArea from '../TextArea';
import { usePrefix } from '../../internal/usePrefix';
import { FormContext } from '../FluidForm/FormContext';

function FluidTextArea({ className, ...other }) {
const prefix = usePrefix();
const classNames = classnames(`${prefix}--text-area--fluid`, className);

return (
<FormContext.Provider value={{ isFluid: true }}>
<TextArea className={classNames} {...other} />
</FormContext.Provider>
);
}

FluidTextArea.propTypes = {
/**
* Provide a custom className that is applied directly to the underlying
* `<textarea>` node
*/
className: PropTypes.string,

/**
* Specify the `cols` attribute for the underlying `<textarea>` node
*/
cols: PropTypes.number,

/**
* Optionally provide the default value of the `<textarea>`
*/
defaultValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),

/**
* Specify whether the control is disabled
*/
disabled: PropTypes.bool,

/**
* Specify whether to display the character counter
*/
enableCounter: PropTypes.bool,

/**
* Provide text that is used alongside the control label for additional help
*/
helperText: PropTypes.node,

/**
* Specify whether you want the underlying label to be visually hidden
*/
hideLabel: PropTypes.bool,

/**
* Provide a unique identifier for the control
*/
id: PropTypes.string,

/**
* Specify whether the control is currently invalid
*/
invalid: PropTypes.bool,

/**
* Provide the text that is displayed when the control is in an invalid state
*/
invalidText: PropTypes.node,

/**
* Provide the text that will be read by a screen reader when visiting this
* control
*/
labelText: PropTypes.node.isRequired,

/**
* `true` to use the light version. For use on $ui-01 backgrounds only.
* Don't use this to make tile background color same as container background color.
*/
light: PropTypes.bool,

/**
* Max character count allowed for the textarea. This is needed in order for enableCounter to display
*/
maxCount: PropTypes.number,

/**
* Optionally provide an `onChange` handler that is called whenever `<textarea>`
* is updated
*/
onChange: PropTypes.func,

/**
* Optionally provide an `onClick` handler that is called whenever the
* `<textarea>` is clicked
*/
onClick: PropTypes.func,

/**
* Specify the placeholder attribute for the `<textarea>`
*/
placeholder: PropTypes.string,

/**
* Specify the rows attribute for the `<textarea>`
*/
rows: PropTypes.number,

/**
* Provide the current value of the `<textarea>`
*/
value: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
};

export default FluidTextArea;
Loading